Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 14 Apr 2012 16:50:10 +0000 (18:50 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 14 Apr 2012 16:50:10 +0000 (18:50 +0200)

Trivial merge