]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into spalax
authorLouis <spalax@gresille.org>
Thu, 17 Jul 2014 10:29:01 +0000 (12:29 +0200)
committerLouis <spalax@gresille.org>
Thu, 17 Jul 2014 10:29:01 +0000 (12:29 +0200)
commit774cf3d323e7f34d7bed19800c5439d38b48c894
tree31a063a4266709ff1e5fbf5e692465a67ee8526e
parentd10e62f955839a3232b1107b17cfa51568c8aee3
parentb1ccd9c4640b0ba2dd067acd185592592744aea4
Merge branch 'master' into spalax