]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:29:47 +0000 (16:29 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 6 Nov 2008 15:29:47 +0000 (16:29 +0100)
commitce4855ecb086d17b8a5e725bb56235b370480f71
tree318b10bc565d16540c48759b7e855e66716280a5
parent8ded9f57a12a27fa5fc1e272ec7b2d2a5aa28419
parent98ffa6e15552852d15191db39a65fea345509d50
Merge commit 'upstream/master' into pub/master