![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Wed, 21 Sep 2016 12:34:36 +0000 (14:34 +0200) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Wed, 21 Sep 2016 12:34:36 +0000 (14:34 +0200) | ||
| commit | 4269cf669f0392c4ac23f315e76a5c5381504630 | |
| tree | 28df9232bc4ed644ff7f3c58d21380d62eb629ef | tree | snapshot |
| parent | 784957ccd992247f82bd9dca77af378339d17363 | commit | diff |
| parent | dd542f77432f38b785aeaf035661592b4f8755e4 | commit | diff |
Merge branch 'master' into sid