Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:12:15 +0000 (12:12 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Feb 2016 11:12:15 +0000 (12:12 +0100)
commit657b41a6239f4801a54dbbd6deec6bee4dc723d5
treea9194296f79a670e4781bc6a697221bf54486f1d
parent5ecc61b349226feeab2de79e871d6ef28f7b9945
parent4d8047e8c97099112f1dccbda15fca0af12fba0c
Merge branch '2014.11' into 2014.11-develop
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/js/widgets/dialog/ImportDialog.js