Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 3 Mar 2010 13:19:12 +0000 (14:19 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 3 Mar 2010 13:19:12 +0000 (14:19 +0100)
commitf23f4aa25e53b6eaf15ab66a1482db046e7be127
tree22614a300a98373e7dd06da0305d6773ad809a26
parentd65208f8841fe457911170dabeeaf859ddfdd1ae
parent0459dded82ee2c88499f4e46a9f3facba519f4f6
Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
doc/changelog
doc/changelog
locale/de/all