diff options
| author | Micah Anderson <micah@riseup.net> | 2010-01-29 16:44:29 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-01-29 16:44:29 -0500 |
| commit | 9a060c5c98808c50020447b3207ea32ded83eb41 (patch) | |
| tree | 75c4a58fe67aa4a1e76691a35578938c97618669 /src | |
| parent | b092a1a17ddeec1da03d348001e8d215012c8ed9 (diff) | |
| parent | 81921efa98093b5bab8d8d62b92120076bfc6810 (diff) | |
| download | backupninja-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