Merge branch 'bug-1165' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:51:07 +0000 (19:51 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:51:07 +0000 (19:51 +0200)
commitfe7668ffcc5aecfb6929bada95b9f1e0e98b47d2
treef95bed138323527584d788677b9c5a46fd36392a
parentd91b1377e0ff0bcaa4919970cfc619f800bfbc1b
parentc319de269e4167e47af8dbe767b4df650747d987
Merge branch 'bug-1165' into release