Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Aug 2015 12:32:49 +0000 (14:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Aug 2015 12:32:49 +0000 (14:32 +0200)
commit2f91cbef87cc4dd919dc266bd0742319ec944f5c
treea7807c0abbf53e6026231cec3256551732d77179
parent61cbbccbefaacd388ebfd23e5e6cfe7320c03f3e
parent64c130f66454f2d69742cc47b7d1ae8f5bd7c4c7
Merge branch '2014.11-develop' into 2015.07
tine20/Tinebase/Container.php