]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master' into pub/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)
commit17f01c3237dd9a91ccb4bbc3ec13d75dc17285a0
tree9878f6e955c92fae68090c87c745bf15bbbfb1ce
parent51de5d80bd318b52efecef4253eeab8292139922
parente7d04199ec730deecc95b55679515bc5618526f8
Merge commit 'upstream/master' into pub/master