Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 12 Feb 2012 19:01:38 +0000 (20:01 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 12 Feb 2012 19:01:38 +0000 (20:01 +0100)

Trivial merge