Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jul 2015 10:29:37 +0000 (12:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jul 2015 10:29:37 +0000 (12:29 +0200)
Conflicts:
tine20/Sales/js/PurchaseInvoiceEditDialog.js

Change-Id: I7982f6e212437969438430798050198b3b523a14

1  2 
tine20/Sales/js/CustomerEditDialog.js
tine20/Sales/js/InvoiceEditDialog.js
tine20/Sales/js/PurchaseInvoiceEditDialog.js
tine20/Sales/js/SupplierEditDialog.js
tine20/Timetracker/js/TimeaccountEditDialog.js

Simple merge
Simple merge
Simple merge