Merge branch 'bug-1308' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 20:04:49 +0000 (22:04 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 30 Sep 2014 20:04:49 +0000 (22:04 +0200)
commitb6510d1f0c875de07626a8c4f818f0edd9e38e26
tree7202a03701a7b7ed8dbf69a4cb7b2c5c3b66ab6b
parent31ae8945c675a96e188180f235e31fb364525e35
parent8df3cb21c04c069806d5af960e7e6dcc0eceec30
Merge branch 'bug-1308' into testserver-stable
includes/general.php