Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-02-26 bdc27bfea618952447ef7facab838df5741f1ec3

1
2
3
4
5
-- -----------------------------------------------------------
-- Dummy patch file
-- Do not edit this file
-- See README.txt in sql folder for detailed instructions
-- -----------------------------------------------------------