Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-25 b01718a0ae2b53c18c01f1374799a00a0c11279f

1
ALTER TABLE `client` ADD `customer_no` VARCHAR( 64 ) NULL AFTER `contact_name` , ADD `vat_id` VARCHAR( 64 ) NULL AFTER `customer_no`;