![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Fri, 29 Jan 2016 13:46:37 +0000 (14:46 +0100) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Fri, 29 Jan 2016 13:46:37 +0000 (14:46 +0100) | ||
| commit | fbf6f6c1a742e6650c2803706a1c3339cc23e209 | |
| tree | 3a77e4bb21b0b9e41275b960aeea880f1af680d1 | tree | snapshot |
| parent | b6acf3e93388f973a1b7c30a2e03d4314e6b9fa2 | commit | diff |
| parent | 43eaffdd5ad4aaf2333bc2085e55a09a7a3d80cd | commit | diff |
Merge branch 'master' into trusty-ppa
| debian/changelog | diff1 | | diff2 | | blob | history |
| debian/rules | diff1 | | diff2 | | blob | history |