Merge branch 'bug-1273' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 21 Oct 2014 20:46:02 +0000 (22:46 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 21 Oct 2014 20:46:02 +0000 (22:46 +0200)
commit350a2f0df6d80e2667a7698ffd1fc613229fab54
treedc19097f925bd5f2b095dc4773f66a864554bee7
parent00c3bbd5944d976ddb17a3bb024fdebb142b3141
parentc2cc1c5e3f8f4b7ec9b786cffbb6f8ec68fcefc9
Merge branch 'bug-1273' into testserver-stable

Conflicts:
scripts/cron/warning.php
scripts/cron/warning.php