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

Trivial merge