Merge branch 'bug-782' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:23:54 +0000 (21:23 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:23:54 +0000 (21:23 +0200)
commit0f787a6c3ce0c6581492422fd7c137ffe546ed83
tree35bd51553c5d8edbbe41df0ba7f8c1045416cbb6
parentc74fc8fa4097f2705f11a600f58734a1b6f672a2
parent57c0aa932a6a24a6588ac30f64b82837047db0bb
Merge branch 'bug-782' into release