diff options
author | intrigeri <intrigeri@boum.org> | 2012-05-15 17:55:51 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2012-05-15 17:55:51 +0200 |
commit | ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf (patch) | |
tree | 392f8d082fb3fc26e1ea30c483c0e19a90f5f7f7 /AUTHORS | |
parent | 1b2dc55cb82d790eca8ea1c2b325a755db75a91a (diff) | |
parent | 13edaf0912f8b36d5035b5ebdbbc28fd0d498427 (diff) | |
download | backupninja-ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf.tar.gz backupninja-ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf.tar.bz2 |
Merge tag 'backupninja_upstream/1.0_rc1' into debian
Upstream version 1.0~rc1
Conflicts:
Makefile.in
aclocal.m4
configure
etc/Makefile.in
examples/Makefile.in
handlers/Makefile.in
install-sh
lib/Makefile.in
man/Makefile.in
missing
src/Makefile.in
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -41,3 +41,5 @@ Sergio Talens-Oliag <sto@debian.org> -- pipefail fixes Bruno Bigras <bigras.bruno@gmail.com> -- enable tar handler in the build system aihtdikh -- Allow 'when = XXX' with spaces in .sh files. Chris Lamb <lamby@debian.org> -- rdiff.helper bugfix +Yuval Kogman <nothingmuch@woobling.org> -- RackSpace's CloudFiles support for duplicity +exobuzz - mysql bugfixes |