]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Wed, 12 Nov 2008 00:12:13 +0000 (01:12 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 12 Nov 2008 00:12:13 +0000 (01:12 +0100)
commitcf7d64a69ed81731d148ed237b800fd4dde98027
treee15daff8f2a6ca60b943ba5a29810270eff23052
parente9e08e8d22af253410abed54eea149927be026f0
parent521d76e5082b5d32bf1fe85b55d85f54f2030090
Merge commit 'upstream/master'