Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 4 Mar 2010 09:32:47 +0000 (10:32 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 4 Mar 2010 09:32:47 +0000 (10:32 +0100)
commit8f29628f54e8b6669cdefa6e43e2f54220760c3c
tree3a7453bc63147aaa4a2ff12c3e9cb446807b15d9
parent0ab14a8af63dff5c16f6ff66f7c4d93509b3660b
parent94466d5c31f52b195dba3a3b16b6a167033e4261
Merge branch 'master' of ssh://lx-office/~/lx-office-erp

Conflicts:
doc/changelog
doc/changelog