Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Mon, 19 Sep 2011 10:40:21 +0000 (12:40 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Mon, 19 Sep 2011 10:40:21 +0000 (12:40 +0200)
commit2e9687c8d57a1609e2936e30c3f97d9366fab61d
tree777d8fcb0e360b2b30534be553e8c91e4c1df13c
parent633f6bb28df74296d1b88c50c3c6b187d13497f6
parentb93a2d44c5725d71a222a067e2b90cb0e602d76e
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp