Merge branch 'aps_remote' into 'master'

Marius Cramer

2015-01-05 551989a9bd9b134858f6709a2756ca9dcec82fd4

1
ALTER TABLE `client` CHANGE `company_id` `company_id` VARCHAR( 255 ) NULL DEFAULT NULL ;