![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Tue, 9 Aug 2016 20:53:13 +0000 (22:53 +0200) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Tue, 9 Aug 2016 20:58:41 +0000 (22:58 +0200) | ||
| commit | c72261dcf93829bd66b03527f3a620f3109562c3 | |
| tree | c7124bd4344c9c160ecde970160a95b0e09df4d9 | tree | snapshot |
| parent | 4f21c2b536309982395f46a276f3bffb99b35f42 | commit | diff |
| parent | 49da0163711068306a628777d12732fa070606af | commit | diff |
Merge branch 'master' into precise-ppa
Conflicts:
debian/changelog
debian/control
Conflicts:
debian/changelog
debian/control
| debian/changelog | diff1 | | diff2 | | blob | history |
| debian/control | diff1 | | diff2 | | blob | history |
| debian/rules | diff1 | | diff2 | | blob | history |