Merge branch 'master' of git.rot13.org:/git/BackupPC
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 16 Feb 2011 15:12:39 +0000 (16:12 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 16 Feb 2011 15:12:39 +0000 (16:12 +0100)
commit005a40bee08e9e026c90084d77206c9c74e3a333
tree52a9e03235eb1eee4474b80bf60fda939b88b281
parentee72b16012de7b99df222310893aa0470da16ff1
parent4556e89be93892a5e4c52b4b7331ba39ba93225d
Merge branch 'master' of git.rot13.org:/git/BackupPC

Conflicts:
bin/BackupPC_ASA_PostArchive_Update