Merge branch 'master' into 'master'

Marius Cramer

2015-07-20 1f50209744f36c1602b11a3787dacfd3ea76527e

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