projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97de9bb 708ff78)
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Fri, 28 Nov 2008 13:19:47 +0000 (14:19 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 28 Nov 2008 13:19:47 +0000 (14:19 +0100)

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