Merge branch 'bug-372' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 17:54:51 +0000 (19:54 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 17:54:51 +0000 (19:54 +0200)
commit95af242992dd8250c14518cb067ae2b094e2cb8a
treee545aacb2249b92bd1cb268b320bab5aa4185052
parent24d8235f875f9ecff3198e3f0cf8d450beae1989
parent9121cc72afd46a4737f6633133873c6d826a5b51
Merge branch 'bug-372' into release