projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9fe33a4 644d099)
Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Fri, 6 May 2016 19:05:45 +0000 (20:05 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 6 May 2016 19:05:45 +0000 (20:05 +0100)

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