]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:37:51 +0000 (23:37 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 4 Nov 2008 22:37:51 +0000 (23:37 +0100)
commitb193b18e5ade1e04df3caea2c2201e087ff44d3e
treed0d9533c4965e0549dda4b38122e29687839fb3d
parent694a8dcbdd44a07e166baa1708563bc9e6fdff51
parent4dc4c9586dbae352c27cd316374fbf0e1db1d082
Merge commit 'upstream/master' into pub/master