projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d3a41e fa72896)
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Wed, 3 Dec 2008 09:44:20 +0000 (10:44 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 3 Dec 2008 09:44:20 +0000 (10:44 +0100)

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