projects / BackupPC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee72b16 4556e89)
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)
Conflicts:
bin/BackupPC_ASA_PostArchive_Update


Trivial merge
BackupPC search extension