Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Fri, 5 Mar 2010 10:10:55 +0000 (11:10 +0100)
committerJan Büren <jan@lx-office-hosting.de>
Fri, 5 Mar 2010 10:10:55 +0000 (11:10 +0100)
commit2e8ce008611246347f9682d81e8fabf015765bf5
tree6857711faab452194e7933ea4c218f4620cdee78
parenta5bebed4cd880e6f6fc5497f7b183f25586342ba
parent705655d4a388cbea644c1992350707f145fc4b22
Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

bin/mozilla/ic.pl
bin/mozilla/ic.pl