Merge branch 'bug-1080' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:48:24 +0000 (18:48 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:48:24 +0000 (18:48 +0100)
commitfde104258845f71b6ca36fe899340f9f97ff910e
tree6dd990d2f3e8adf0be30d77b33aba8f0f5eaaa23
parent06b1d82f7de4f515f1ca9985bd7201f3658022a8
parent304b385fb87e0b4b9be33c95f487f5680b708d1e
Merge branch 'bug-1080' into release