]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:39:51 +0000 (04:39 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 11 Nov 2008 03:39:51 +0000 (04:39 +0100)
commitc0275aa17f44d7605f542461d800567dde7f79b8
tree01ae1f7e7d31db5d71c24878ef939041fe1140b0
parentf12b73b7e04147e232e3cb516b578f749823414c
parent53752bcb5d17ec51901ec926208793f9450b3243
Merge commit 'upstream/master' into pub/master