Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 9 Jan 2012 16:42:11 +0000 (17:42 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 9 Jan 2012 16:42:11 +0000 (17:42 +0100)
commit59358b2aa73e38ccbb690e900295aa79d7b4148a
tree28ef22ba22fbf850a7dcc5c78a73159088bdfd28
parent658cfd354abae0cb07cc4a1238b2974eecfa1329
parent8003c3b1db2dd73402977fcfe29653108794099c
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp