Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
 
-- Add bank account owner
ALTER TABLE `client` ADD `bank_account_owner` varchar(255) DEFAULT NULL AFTER `notes`;