Merge branch 'bug-1339' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:36:13 +0000 (19:36 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 18 Nov 2014 18:36:13 +0000 (19:36 +0100)
commitce9b70c7ed7224185f467ac1bd955af7b9bb28cc
tree3e43e807b4e587112f835dc94953392f91be48b0
parentfb720bf477205d505c37a47eb29b965a4dcc2b04
parent3e578bf67cf3ba551aecae52b2f95d910af336ec
Merge branch 'bug-1339' into release