projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 713e114 98ffa6e)
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:29:47 +0000 (16:29 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:29:47 +0000 (16:29 +0100)

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