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 /lib/vserver.in | |
| 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 'lib/vserver.in')
0 files changed, 0 insertions, 0 deletions