Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 16 Jan 2012 14:46:34 +0000 (15:46 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 16 Jan 2012 14:46:34 +0000 (15:46 +0100)

Trivial merge