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

Trivial merge