Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rsync1.maxxo.com>
Thu, 22 Dec 2011 14:54:01 +0000 (15:54 +0100)
committerDobrica Pavlinusic <dpavlin@rsync1.maxxo.com>
Thu, 22 Dec 2011 14:54:01 +0000 (15:54 +0100)

Trivial merge