Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 5 Mar 2010 12:48:29 +0000 (13:48 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 5 Mar 2010 12:48:29 +0000 (13:48 +0100)
commitac4d2ca19405fc1c6d8580af147e233dcf46c5b9
treed58e4aeb8ab0748b8bccc8b851e6008244fdcf93
parentc3d00acae1bfa59c624d9cdc5f9fbda586320663
parentf28ad03552a0e5b37271a85e98ec417a02d46932
Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
doc/changelog
doc/changelog