diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-13 11:42:36 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-13 11:42:36 +0100 |
| commit | 6ad15139e00ef378ee035b15c25cf7a40127e689 (patch) | |
| tree | 9807887fb828ea3549dde0b1cfd10c731441e046 /Makefile.am | |
| parent | 8098286aa1c8d751e7cf1872775a1bb41538624f (diff) | |
| parent | ab92883a63860b626bfc2faafd54a1544e1b8583 (diff) | |
| download | backupninja-6ad15139e00ef378ee035b15c25cf7a40127e689.tar.gz backupninja-6ad15139e00ef378ee035b15c25cf7a40127e689.tar.bz2 | |
Merge remote branch 'origin/0.9.8.1'
Conflicts:
AUTHORS
ChangeLog
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions