![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Tue, 31 May 2016 16:34:06 +0000 (18:34 +0200) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Tue, 31 May 2016 16:34:06 +0000 (18:34 +0200) | ||
| commit | 784957ccd992247f82bd9dca77af378339d17363 | |
| tree | 02397b39fe19d56804b895d99bf0be37ba6238d0 | tree | snapshot |
| parent | 2daec89f3d93a3a46f811b89b354000fcc5b89f9 | commit | diff |
| parent | 45fbcdcb2e1b144e06b6eb02403dcc7734a8e628 | commit | diff |
Merge branch 'master' into sid