Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Mon, 11 Jul 2011 11:49:24 +0000 (13:49 +0200)
committerG. Richardson <information@lx-office-hosting.de>
Mon, 11 Jul 2011 11:49:24 +0000 (13:49 +0200)

Trivial merge