Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorBernd Blessmann <bibi@online.de>
Mon, 9 Jan 2012 17:07:02 +0000 (18:07 +0100)
committerBernd Blessmann <bibi@online.de>
Mon, 9 Jan 2012 17:07:02 +0000 (18:07 +0100)
commit5c5d0641f55504c2e9ed860633caba14d313981d
tree4c664c5f124496b05d4bcc34bd973ef5c6126fa2
parent1114de4f55d96b047fffe1d428a15823cf0002d5
parent77527022ef849e10970f285717b9db5d383a1a2e
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

Conflicts:
doc/changelog
doc/changelog