Merge branch 'master' of lx-office.linet-services.de:lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 20 May 2011 11:08:50 +0000 (13:08 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 20 May 2011 11:08:50 +0000 (13:08 +0200)
commit9e0b2baff3315e53a0e0aa9e66cae85e474def7a
treefa4d3e42588f20fdbcb73b6f857ee79304896e9e
parent9c88730671d29cbf39b619c1efd5f04afcc38816
parentf0864171a2490c65f4aa70f06a500ae749f8dc73
Merge branch 'master' of lx-office.linet-services.de:lx-office-erp