Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 23 Aug 2011 23:32:21 +0000 (23:32 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 23 Aug 2011 23:32:21 +0000 (23:32 +0000)

Trivial merge