aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-01-29 16:44:29 -0500
committerMicah Anderson <micah@riseup.net>2010-01-29 16:44:29 -0500
commit9a060c5c98808c50020447b3207ea32ded83eb41 (patch)
tree75c4a58fe67aa4a1e76691a35578938c97618669 /src
parentb092a1a17ddeec1da03d348001e8d215012c8ed9 (diff)
parent81921efa98093b5bab8d8d62b92120076bfc6810 (diff)
downloadbackupninja-9a060c5c98808c50020447b3207ea32ded83eb41.tar.gz
backupninja-9a060c5c98808c50020447b3207ea32ded83eb41.tar.bz2
Merge branch 'master' into debian
Conflicts: AUTHORS examples/example.ldap
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions