Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Thu, 4 Mar 2010 08:58:27 +0000 (09:58 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Thu, 4 Mar 2010 08:58:27 +0000 (09:58 +0100)
Conflicts:

doc/changelog


Trivial merge