Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 12 Nov 2012 16:58:42 +0000 (17:58 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 12 Nov 2012 16:58:42 +0000 (17:58 +0100)
commit420cc628dce84d55be98be5f9987b13879c2010e
treef774201ad5fa15f753d271618597791820a6675e
parent8972865b3a6b347d4c3bdb510b5961baf81b117c
parentbf32f143e97443f074c37772a052b861ad3492ff
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp