![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc@bl.uem.li> | |
| Fri, 22 Jan 2016 16:36:11 +0000 (17:36 +0100) | ||
| committer | Marc Fournier <marc@bl.uem.li> | |
| Fri, 22 Jan 2016 16:36:11 +0000 (17:36 +0100) | ||
| commit | 23c6241ec47be1e651f5423265a34c02b307afa2 | |
| tree | 30995338e2f318f8418f795865f7d0f25a46ede5 | tree | snapshot |
| parent | dadeee57d49bf27c7caa95e246c22ae0946a1f5d | commit | diff |
| parent | 43eaffdd5ad4aaf2333bc2085e55a09a7a3d80cd | commit | diff |
Merge branch 'master' into sid