Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 27 Aug 2012 13:01:39 +0000 (15:01 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 27 Aug 2012 13:01:39 +0000 (15:01 +0200)
commit1e1a8a24199f65940bd3870c369459f7b6a002c5
treeeb78c9efb286d3935c332692cc80b7551794b3a8
parent22efd8a7bcfbeaca36f0f703b3f6bbbe90ff08dc
parent0f988add03549dbb11f12e0e3c6ab8fcbcdea911
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp