projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 694a8dc 4dc4c95)
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:37:51 +0000 (23:37 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:37:51 +0000 (23:37 +0100)

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