Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 6 Dec 2010 11:45:31 +0000 (12:45 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 6 Dec 2010 11:45:31 +0000 (12:45 +0100)
commit57463eed482c9f107a6bb35d8b24d666175570a3
tree7ee93f728637d1c540c75d51d9187e6707631ed9
parent914d2b3fda11d4cf465c0ee33f07c03fa2e1f45f
parent7ad942750f0294bdbbbb6f0693bea17dcc75f18b
Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

doc/changelog
doc/changelog