Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 9 Apr 2010 13:36:21 +0000 (15:36 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 9 Apr 2010 13:36:21 +0000 (15:36 +0200)
commit14e2159f732ab3b7b3372daa2e257e65fdc13e18
treef72c079bae4d5f1e9792ccbcce6432a492094151
parentb122b2f784ae42a562ad0b6fefb6b780087782a0
parent4d6eef314a378d290f591fd1970583a2a2aa8c92
Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp