Merge branch 'bug-1190' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 9 Sep 2013 19:02:59 +0000 (21:02 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 9 Sep 2013 19:02:59 +0000 (21:02 +0200)
commit55d2a7b1fdd6aba528adf5afaec880ebf067edcf
tree4e95362ca4cc4ef6551fa0e572479427649e3792
parented332a25dedba4b372d45e4bc4d5276d96d6ae38
parentcb81c2340d8816344d315539707988fabfd7f4d9
Merge branch 'bug-1190' into release