![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Sun, 10 Jun 2012 10:41:52 +0000 (12:41 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Sun, 10 Jun 2012 10:41:52 +0000 (12:41 +0200) | ||
| commit | be3a967ae8ab9e7849addb54b2564e11da29d88e | |
| tree | 09ee4e1e7e3018ac3b6ae8d3068eced43cc9cb24 | tree | snapshot |
| parent | 5562887e2d400075d22ffa8c95d429800ca6e388 | commit | diff |
| parent | fb36e9aa4df6786b249117385554ff75400adb4c | commit | diff |
Merged branch 'nmu/1.8.5-0.1'.
Conflicts:
debian/changelog
debian/control
Conflicts:
debian/changelog
debian/control
| debian/changelog | diff1 | | diff2 | | blob | history |
| debian/control | diff1 | | diff2 | | blob | history |