Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorMoritz Bunkus <moritz@bunkus.org>
Tue, 10 Jan 2012 10:37:43 +0000 (11:37 +0100)
committerMoritz Bunkus <moritz@bunkus.org>
Tue, 10 Jan 2012 10:37:43 +0000 (11:37 +0100)
commit8dc39e5b266ed304c6370b7599ed956218681a02
tree6acf2ee874f547c7e9367b9549d680a25ec315d0
parent72585c35d48589e072325ffc46c720df080e2ca1
parentfca2825c79e6740fd511a2f86df9cb1ff898bfdf
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp