diff options
| author | Micah Anderson <micah@riseup.net> | 2010-01-17 23:54:09 +1300 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-01-17 23:54:09 +1300 |
| commit | fe3620c6529cc449cd152ed58667e39d4a80257e (patch) | |
| tree | ec83be42237855979a31f38cdce51f45cdbd7312 /FAQ | |
| parent | 18f28c2cb00286cc0ff790ef6b6914f3f22ec4ac (diff) | |
| parent | 46eccf2fd0c894790405b2e3aae8dfb99f5a5d98 (diff) | |
| download | backupninja-fe3620c6529cc449cd152ed58667e39d4a80257e.tar.gz backupninja-fe3620c6529cc449cd152ed58667e39d4a80257e.tar.bz2 | |
Merge branch 'master' into debian
Conflicts:
AUTHORS
ChangeLog
handlers/maildir.in
handlers/mysql.in
handlers/rsync.in
handlers/sys.helper.in
handlers/sys.in
src/backupninja.in
Diffstat (limited to 'FAQ')
0 files changed, 0 insertions, 0 deletions