]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e33482 bc70524)
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 10:52:19 +0000 (11:52 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 7 Nov 2008 10:52:19 +0000 (11:52 +0100)

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