]> 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: 51de5d8 e7d0419)
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 17:03:04 +0000 (18:03 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 17:03:04 +0000 (18:03 +0100)

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