Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 23 Jul 2013 10:11:58 +0000 (12:11 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 23 Jul 2013 10:11:58 +0000 (12:11 +0200)
commit2d2928049e4dd6eda88afcf3905ea8bf3198ecbd
treecfc96fa2604a8b2d0209d1f0150c300bab6e4e06
parent9da8c60d50200f889872fcc7929adc5052fa945e
parent43d726cd199f2a6fa43e9244a859767b5e3c0ce0
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/js/extFixes.js
tine20/Tinebase/js/extFixes.js