Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:38:43 +0000 (11:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:38:43 +0000 (11:38 +0100)
1  2 
tine20/Crm/Controller/Lead.php
tine20/Sales/Controller/Invoice.php
tine20/Sales/Controller/PurchaseInvoice.php
tine20/Tinebase/Relation/Backend/Sql.php

Simple merge
Simple merge