![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Sun, 18 Dec 2016 21:13:34 +0000 (22:13 +0100) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Sun, 18 Dec 2016 21:13:34 +0000 (22:13 +0100) | ||
| commit | 3d33c6a25acc4d120468a76bd7684fd789a4a64c | |
| tree | f342b93a3e19be332ff894d8ef994b2851c4ef6f | tree | snapshot |
| parent | 3b3c9375cb3bb12227e76bf56d1a7d97706a8077 | commit | diff |
| parent | 2de9f5f705be51e44f94c67d16319baa6c7d40f6 | commit | diff |
Merge branch 'master' into sid