Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@kivitendo-premium.de>
Wed, 7 Nov 2012 14:50:33 +0000 (15:50 +0100)
committerNiclas Zimmermann <niclas@kivitendo-premium.de>
Wed, 7 Nov 2012 14:50:33 +0000 (15:50 +0100)
commit8a40e3dd0f638557b8c666fe708ccbc1ac709c4e
treef205b75b60b7c270c2cda2be1e511888ef06d42e
parentc57ef415561fbdbbf95e45516dc71a643e22369a
parentf4b68a7889401918484f2c887bad80190d9bac01
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp