Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 19 Sep 2011 10:40:21 +0000 (12:40 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 19 Sep 2011 10:40:21 +0000 (12:40 +0200)

Trivial merge