Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 7 Sep 2012 13:46:54 +0000 (15:46 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 7 Sep 2012 13:46:54 +0000 (15:46 +0200)
commit5156f36154531634b0e1fa47664da897111a7f2c
tree8fe659c46bb58bd6058da021a39c140c4187d192
parentda8bd00baa120bea3fca65ec8d151cd40b9ef1b4
parent133c31d7bbecce664b623043df1aa93285603f16
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp