Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Fri, 4 Nov 2011 12:40:51 +0000 (13:40 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Fri, 4 Nov 2011 12:40:51 +0000 (13:40 +0100)

Trivial merge