![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Wed, 25 May 2016 21:44:58 +0000 (23:44 +0200) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Wed, 25 May 2016 21:44:58 +0000 (23:44 +0200) | ||
| commit | 2daec89f3d93a3a46f811b89b354000fcc5b89f9 | |
| tree | 9ffea72268149aabb01d736c200d9df4aa71891f | tree | snapshot |
| parent | 23c6241ec47be1e651f5423265a34c02b307afa2 | commit | diff |
| parent | c0dc55f41716e618a98b9dc931de2fc4efa8c521 | commit | diff |
Merge branch 'master' into sid