projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4e1782f 71ea77a)
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:14:07 +0000 (14:14 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 13:14:07 +0000 (14:14 +0100)

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