]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 18 Nov 2008 22:06:42 +0000 (23:06 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 18 Nov 2008 22:06:42 +0000 (23:06 +0100)
commit5c7771e01aafb7b2e197f58a725132e4c2f4bde8
tree4a1281b89778ad0d913710a1545373ac9be4a0b9
parent44ca50db9d87142d860b1d9d959a27ede0402b0d
parent23f5874a56f66c0bb5d5921d21418c7363786b1b
Merge commit 'upstream/master' into pub/master