Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 May 2013 16:39:49 +0000 (18:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 May 2013 16:39:49 +0000 (18:39 +0200)
commitdee564c0120e10c57eff0af30c0e75118c19b598
tree37e226ecee29d67e6b7877d256140fd0ac998d47
parentf5f8ba2a5de62b68984354e28e5c6bcb164edaf8
parentdfbd2a4ec61b7a593704a464507c4a4897636609
Merge branch '2013.03'

Conflicts:
tine20/HumanResources/js/Models.js
tine20/Tinebase/js/widgets/dialog/DuplicateResolveGridPanel.js
tine20/Tinebase/js/widgets/grid/FilterPanel.js