]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:30:44 +0000 (16:30 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:30:44 +0000 (16:30 +0100)
commitcaffc0f8de2f7eb7ad16ae8002da52202d0b1754
treee303a55332f1a28a033e7efd0dc14bfa927dd1a4
parentce4855ecb086d17b8a5e725bb56235b370480f71
parent725dae735334c5762f7f500a20d0ca65788cf137
Merge commit 'upstream/master' into pub/master