Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Tue, 17 May 2011 16:01:33 +0000 (18:01 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Tue, 17 May 2011 16:01:33 +0000 (18:01 +0200)

Trivial merge