Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 10 Oct 2011 16:45:45 +0000 (18:45 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 10 Oct 2011 16:45:56 +0000 (18:45 +0200)
Conflicts:
rsync-piper.pl
test.sh


Trivial merge