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)
commitdff2d908e7e2d50da75828134182eacf3e933673
tree91ef5ed7c07012dd49cb969a7c8150915910c8fd
parent00f1376fbe69bd74552c5444eff4c05009cb8a8b
parent9f0677582eb179f588243606393b670168efecb9
Merge branch 'master' of git.rot13.org:/git/cloudstore

Conflicts:
rsync-piper.pl
test.sh