]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/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)
commit9b20e0a24ef0bba1a04eb5d29a5a855f242cd933
treee15daff8f2a6ca60b943ba5a29810270eff23052
parent4668c290e9c625682c998afc38b76215a212fc10
parent521d76e5082b5d32bf1fe85b55d85f54f2030090
Merge commit 'upstream/master' into pub/master