![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Mon, 23 Jan 2017 19:48:23 +0000 (20:48 +0100) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Mon, 23 Jan 2017 19:48:23 +0000 (20:48 +0100) | ||
| commit | 86468c27119e776a104594fdba88b3da254de205 | |
| tree | 2416832bf7a6c376b0f1f3ed62d616413f8285c2 | tree | snapshot |
| parent | 3d33c6a25acc4d120468a76bd7684fd789a4a64c | commit | diff |
| parent | 7ea55ea7453740246e34d83dbb80fc0fc92f4319 | commit | diff |
Merge branch 'master' into sid