]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:53:28 +0000 (21:53 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:53:28 +0000 (21:53 +0100)
commitd47de5a7dfc0cc3e9d8ed2d51fc0e353f3141177
treef6cc7751b4ea5dce01fa6bfe33be246911797b0c
parentf7d89faec9f747a800564b6bd3f9bc155402e37d
parent53af988255ed248d419029e4d5c760f6a4037c5a
Merge commit 'upstream/master' into pub/master