Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Sat, 18 Dec 2010 13:14:24 +0000 (14:14 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Sat, 18 Dec 2010 13:14:24 +0000 (14:14 +0100)

Trivial merge