Merge branch 'bug-1131' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 16 Sep 2014 20:17:41 +0000 (22:17 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 16 Sep 2014 20:17:41 +0000 (22:17 +0200)
commit0ec4893373fa2b7ea83e2b97842635c3e2569947
tree896eee2ebcdbd94a676a8eaa8641da130c43f804
parentfd85f2309123a8853f09cdcb53567f6afe591d65
parentc6fe86e02ea5fa46ea52879de0bdb453f703adae
Merge branch 'bug-1131' into testserver-stable