Merge branch 'master' of git@vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Thu, 27 Oct 2011 12:17:29 +0000 (14:17 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Thu, 27 Oct 2011 12:17:29 +0000 (14:17 +0200)

Trivial merge