Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 15 Apr 2012 21:10:00 +0000 (23:10 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 15 Apr 2012 21:10:00 +0000 (23:10 +0200)

Trivial merge