Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 27 Aug 2011 00:27:00 +0000 (00:27 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sat, 27 Aug 2011 00:27:00 +0000 (00:27 +0000)

Trivial merge