]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:02:55 +0000 (12:02 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:02:55 +0000 (12:02 +0100)
commitb0f5f37317242721765d463ad7785b995caee490
treebb2498f5afa0d68f8b0923bb2e7b44b7472c9091
parent75b765259ef6e722c00130280b021da4f1f43ddc
parent466ceb13946699cbd6b0ef0cad8f3040804265ae
Merge commit 'upstream/master'