]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/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)
commit61ac01babc25e804c2948815580df6b3781206b6
treee5db468cefdadb50bfc012e4aa3b5488a314b385
parentdb476e7d1b83f2101a05c161393e04374b4f678e
parent1c4a4a41e1c96d0f486a7b039718dd5f35865af2
Merge commit 'upstream/master'