]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:53:25 +0000 (21:53 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:53:25 +0000 (21:53 +0100)
commitde9e7da35a337aa9b0ccca35bd564cf069d0d67d
treec2830126f4496594c44f77c09a50c494741b1956
parent0f75ca66a743fcf69a83b3218da099ea0042493f
parent53af988255ed248d419029e4d5c760f6a4037c5a
Merge commit 'upstream/master'