Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 3 Mar 2010 13:56:26 +0000 (14:56 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 3 Mar 2010 13:56:26 +0000 (14:56 +0100)
commit9ba051f59c5d02e82ca54ae19e3233f895058f9b
treeb9d0493fe4f445dbbc005e1a141ea3157a0a8451
parent45cc8d1e638a2f31529da78a49e00bf2e8937201
parentd82cd38a11d2ae37ca658b6932e28593a71c9a7e
Merge branch 'master' of ssh://lx-office/~/lx-office-erp

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