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)
1  2 
tine20/Addressbook/js/ContactGrid.js
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/js/widgets/dialog/ImportDialog.js

Simple merge