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