Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Wed, 29 Dec 2010 11:40:05 +0000 (12:40 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Wed, 29 Dec 2010 11:40:05 +0000 (12:40 +0100)

Trivial merge