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

Trivial merge