Code

Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool
authorBernd Zeimetz <bzed@debian.org>
Sun, 24 Feb 2008 20:57:40 +0000 (21:57 +0100)
committerBernd Zeimetz <bzed@debian.org>
Sun, 24 Feb 2008 20:57:40 +0000 (21:57 +0100)
commit4faf3533d10ac5f4c39eed74d22263565483a9df
treeeec0af79f26da6b24bf5f81a0c641a9efc677d49
parent2663f1ece78e072b61f733ee4d019519381af43c
parentd2306427b0f3e7048526612b2821f91dfc3dc296
Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool

Conflicts:

debian/changelog
debian/changelog
debian/rules