Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Fri, 16 Nov 2012 15:22:12 +0000 (16:22 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Fri, 16 Nov 2012 15:22:12 +0000 (16:22 +0100)

Trivial merge