Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9

1
ALTER TABLE `cron` ADD `log` enum('n','y') NOT NULL default 'n' AFTER `run_wday`;