Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Tue, 3 Apr 2012 14:26:45 +0000 (16:26 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Tue, 3 Apr 2012 14:26:45 +0000 (16:26 +0200)
commit954b24d2ef8c7f72da0af3637035c83f8ebdfc0d
tree643ff6a2363f65a1c2ec7dae9eefe8b0322e802e
parentc1f307ca11f7b695a04101d55327390ea5a55d95
parentf5f3c1a7e1328c46a970223c50a8cba81180d870
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp