]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into prv/po
authorintrigeri <intrigeri@boum.org>
Sun, 18 Jan 2009 12:56:15 +0000 (13:56 +0100)
committerintrigeri <intrigeri@boum.org>
Sun, 18 Jan 2009 12:56:15 +0000 (13:56 +0100)
commit14b49376dc03672f896e5f1df3945a718a39d5a0
tree1f1762079f90b781d1bc59be69460c196ec44406
parent73a7bd2f689bb259ceb427375a7196ddcb3f48da
parentaecc45bd20d19f6870ffb4b0ebcf33fe8afc5685
Merge commit 'upstream/master' into prv/po