author | Bernd Zeimetz <bzed@debian.org> | |
Sun, 10 Feb 2008 21:15:42 +0000 (22:15 +0100) | ||
committer | Bernd Zeimetz <bzed@debian.org> | |
Sun, 10 Feb 2008 21:15:42 +0000 (22:15 +0100) | ||
commit | a6b145c9d9f85c0043cec9a41d4539f17f295c87 | |
tree | 3e9fc829858f0a021e123ffc21fabdd12f161521 | tree | snapshot |
parent | e65862867f96bdd9c76495276ae0cc523332c498 | commit | diff |
parent | 6cceadc3217a388e15a60fec63b30acae2db2f40 | commit | diff |
Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool
Conflicts:
debian/changelog
Conflicts:
debian/changelog
debian/changelog | diff1 | | diff2 | | blob | history |
debian/rules | diff1 | | diff2 | | blob | history |