Merge branch 'bug-1118' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Jan 2013 23:11:59 +0000 (00:11 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Jan 2013 23:11:59 +0000 (00:11 +0100)
commit3441e9895738e27a95518680209c41641eff7df0
treedef0da8245541a3e715d6abddacd85d4fbaaec09
parent2ceda5171ff3161c8b05860879c4d4c9f5f842ea
parent7cf8281e0ed24aa03766d847361b5e4945a47c16
Merge branch 'bug-1118' into release