Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 7 Nov 2012 13:22:58 +0000 (14:22 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 7 Nov 2012 13:22:58 +0000 (14:22 +0100)
commit71f36a976aa047e2659b76241dd53a165f2de928
tree56ab48d2f16d6cb5b438e10a8ea3e55981f08c44
parent74d33c7dac34e5f4aa55c259f5ec6f07fff81751
parent16df30aaca2c8d4173f1ea76be206ef5a23e69c9
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp