![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Sun, 26 May 2013 18:40:49 +0000 (20:40 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Sun, 26 May 2013 18:40:49 +0000 (20:40 +0200) | ||
| commit | 93d3b33e36052060a7aae76781207e439596cd80 | |
| tree | 174c806645b915cb6f272750d39089d336e71afd | tree | snapshot |
| parent | 6080e67d7c0d303608cb7c04b3ee6f378cae84d2 | commit | diff |
| parent | efbdef15bd2f66b338d840e5a69077ad40d95c6c | commit | diff |
Merged branch 'unstable-nmu'.
Conflicts:
debian/changelog
debian/patches/00list
Conflicts:
debian/changelog
debian/patches/00list
| debian/changelog | diff1 | | diff2 | | blob | history |
| debian/control | diff1 | | diff2 | | blob | history |
| debian/patches/00list | diff1 | | diff2 | | blob | history |
| debian/rules | diff1 | | diff2 | | blob | history |