Merge branch 'bug-1083' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:50:11 +0000 (18:50 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:50:11 +0000 (18:50 +0100)
commit53b015bf6782b44e7c69f654734813a64da28a0e
tree6fa0cb52e5759698b9377a9a74e4fb9c9ad6184a
parentfde104258845f71b6ca36fe899340f9f97ff910e
parent43f6bbc5f04d8f1ae832a4652ce75d1b91a14084
Merge branch 'bug-1083' into release