Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 4 Oct 2011 17:16:59 +0000 (17:16 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 4 Oct 2011 17:16:59 +0000 (17:16 +0000)

Trivial merge