Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 3 Mar 2010 12:24:00 +0000 (13:24 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 3 Mar 2010 12:24:00 +0000 (13:24 +0100)
commit64dde83b543cc17701993dfea6afdec28f3c7e1f
tree2db5a7afc3190bddaec0bd951d5cb339fc6e2e77
parent59ee7d200d314b10f49e4ed137578c41d156e74a
parentf536ffb111b455f830b26add666faaeda56f101f
Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp