]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 21:38:31 +0000 (22:38 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 21:38:31 +0000 (22:38 +0100)
commit603a0ce99c03db9d2a812864f60f16fca60c8673
tree72a5f085cc735fa47490b7b8f52f7d09a6b333e3
parent2863b45b5f93de8708ea20cf3db15ca610a467d7
parent53af988255ed248d419029e4d5c760f6a4037c5a
Merge commit 'upstream/master' into pub/master