Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorG. Richardson <information@lx-office-hosting.de>
Thu, 19 May 2011 09:20:17 +0000 (11:20 +0200)
committerG. Richardson <information@lx-office-hosting.de>
Thu, 19 May 2011 09:20:17 +0000 (11:20 +0200)

Trivial merge