Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Fri, 24 Feb 2012 10:25:45 +0000 (11:25 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Fri, 24 Feb 2012 10:25:45 +0000 (11:25 +0100)

Trivial merge