]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:38:48 +0000 (04:38 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 13 Nov 2008 03:38:48 +0000 (04:38 +0100)
commit6d98c5290f2542552979e374d8e3dcbef51f31a6
tree2597f22e365fa4b7a1d7bfac7b24ee6b70959f9d
parent04301c3becbb4bd37412321eee09dcf5c6b49f97
parent699aa79c2e2dbec02a38ba6ff32e9c861ee9f7be
Merge commit 'upstream/master'