Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Mon, 9 Jan 2012 17:34:47 +0000 (18:34 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Mon, 9 Jan 2012 17:34:47 +0000 (18:34 +0100)

Trivial merge