Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 11 Sep 2011 13:29:51 +0000 (15:29 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 11 Sep 2011 13:29:51 +0000 (15:29 +0200)

Trivial merge