projects
/
BackupPC.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
ee72b16
4556e89
)
Merge branch 'master' of git.rot13.org:/git/BackupPC
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Wed, 16 Feb 2011 15:12:39 +0000
(16:12 +0100)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Wed, 16 Feb 2011 15:12:39 +0000
(16:12 +0100)
Conflicts:
bin/BackupPC_ASA_PostArchive_Update
Trivial merge