]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 02:29:27 +0000 (03:29 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 02:29:27 +0000 (03:29 +0100)
commitf12b73b7e04147e232e3cb516b578f749823414c
treee5db468cefdadb50bfc012e4aa3b5488a314b385
parent4da365136ac123291d3b608adb3192311692182d
parent1c4a4a41e1c96d0f486a7b039718dd5f35865af2
Merge commit 'upstream/master' into pub/master