projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d10e62f b1ccd9c)
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)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.