diff options
| author | intrigeri <intrigeri@boum.org> | 2010-08-26 02:04:13 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-08-26 02:04:13 +0200 |
| commit | 93041732b3ccffa113693af8480d69fc080d9ec1 (patch) | |
| tree | b2950b49cba6a22b448a7e88819c2ac6c26847ad /AUTHORS | |
| parent | e6c65815c8201d123f477e05a367832204c39886 (diff) | |
| parent | 40155781065eb7254eb9fc9c48bd85b0b8ace4c0 (diff) | |
| download | backupninja-93041732b3ccffa113693af8480d69fc080d9ec1.tar.gz backupninja-93041732b3ccffa113693af8480d69fc080d9ec1.tar.bz2 | |
Merge branch 'master' into debian
Conflicts:
examples/example.ldap
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -30,7 +30,8 @@ Matthew Palmer <mpalmer@debian.org> -- halt loglevel feature dan@garthwaite.org -- reportspace bugfix Tuomas Jormola <tj@solitudo.net> -- "when = manual" option Ian Beckwith <ianb@erislabs.net> -- dup bandwidthlimit fix -Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix, reportinfo option +Olivier Berger <oberger@ouvaton.org> -- much work on the dup handler stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion +Dan Carley -- mysql bugfix |