Merge branch 'master' into 'master'

Marius Burkard

2015-11-26 add7cc461c0729819c73b2bf44076037a1592517

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