]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:37:57 +0000 (12:37 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 11:37:57 +0000 (12:37 +0100)
commit713e114f132096c5aec01265ca9703708b47af4f
tree67975f3ca74a4e38e5a56052e45a3898f82807bc
parenta020228805485f19e35f72d0be50d1013d5109ec
parent256b3aeba8a1a9e41c2e89d9030a1a55be060540
Merge commit 'upstream/master'