author | Sebastian Harl <sh@teamix.net> | |
Thu, 31 Jan 2013 07:38:40 +0000 (08:38 +0100) | ||
committer | Sebastian Harl <sh@teamix.net> | |
Thu, 31 Jan 2013 07:38:40 +0000 (08:38 +0100) | ||
commit | aa9f45c632b3fa70f202525c195bcfb06fb0e871 | |
tree | 1631d27cb7dafe2f4ac41931b8ca2f3047d635cc | tree | snapshot |
parent | 33e98654bf86c79dae38399eb6499918688e27f7 | commit | diff |
parent | c40f33b3ff79baf1f6327f82b183548728ecbcfa | commit | diff |
Merged branch 'experimental' into debmon-squeeze.
Conflicts:
debian/changelog
Conflicts:
debian/changelog
debian/changelog | diff1 | | diff2 | | blob | history |
debian/control | diff1 | | diff2 | | blob | history |