Merge branch 'master' of git://lx-office.linet-services.de/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Fri, 13 May 2011 12:44:02 +0000 (14:44 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Fri, 13 May 2011 12:44:02 +0000 (14:44 +0200)

Trivial merge