Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 15:24:26 +0000 (16:24 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Mon, 9 Jan 2012 15:24:26 +0000 (16:24 +0100)
commit21c964b9ec4972346d9c6b7fef370268b4caf789
tree8edb9def389e54c6b84624b6c9cb0e81f7c4fee9
parentcc5d61a92113701ad19ef3c366da307307a764b0
parent1ee0a24734aefd23212f06419289980366fa3803
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp