Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Thu, 4 Mar 2010 08:58:27 +0000 (09:58 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Thu, 4 Mar 2010 08:58:27 +0000 (09:58 +0100)
commit93c6ec51f6bb239eb52c3e0b0d1adf87f57796ee
tree95a648b304b127e30ff9acf86668663bed10a0f0
parent8ee1c3bdc197b96b01d1a7cf9f85d05e1e80181d
parentb3f7c4077d8ab6f4fd6dda7e94abc3e3154c43dc
Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

doc/changelog