Merge branch 'bug-1208' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:28:23 +0000 (22:28 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 15 Oct 2013 20:28:23 +0000 (22:28 +0200)
commitb46ec1ee22d739bf0c839d4bb8696e54ea6d03ef
tree6c3669e0e1df2093d7c1583d23ec128f3118e34a
parent55d2a7b1fdd6aba528adf5afaec880ebf067edcf
parentd02fa95efa8f98f39f25d9f0a0683c19e7fbbd72
Merge branch 'bug-1208' into release