]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'origin/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)
commita020228805485f19e35f72d0be50d1013d5109ec
treebb2498f5afa0d68f8b0923bb2e7b44b7472c9091
parentb0f5f37317242721765d463ad7785b995caee490
parent70353c5807ca950ad652ea9da19665631369d5a6
Merge commit 'origin/master'