]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 17:03:04 +0000 (18:03 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 8 Nov 2008 17:03:04 +0000 (18:03 +0100)
commita4a1b8e6532b38cc3d045647b568cb2e6d737524
tree9878f6e955c92fae68090c87c745bf15bbbfb1ce
parent92ba3bb4a1b84ffa791fa0be88529e96fd71b157
parente7d04199ec730deecc95b55679515bc5618526f8
Merge commit 'upstream/master'