Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@lx-office-hosting.de>
Tue, 4 Sep 2012 15:15:33 +0000 (17:15 +0200)
committerNiclas Zimmermann <niclas@lx-office-hosting.de>
Tue, 4 Sep 2012 15:15:33 +0000 (17:15 +0200)
commit0499c65ed3ba3c3ac87b5aab9a60c3cc33be0796
treeef374f985cb3af2745405857d7a66cd7ca884c96
parente7f0039c14a102c5b263d92ca9b7792f122e28ae
parent36b5dead243946c4447e9a854ebd67e613853f88
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp