Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
authorJan Büren <jan@lx-office-hosting.de>
Tue, 12 Oct 2010 10:23:45 +0000 (12:23 +0200)
committerJan Büren <jan@lx-office-hosting.de>
Tue, 12 Oct 2010 10:23:45 +0000 (12:23 +0200)
commitaef4bc0c25c038294c180ba710099d63d2919a3e
tree116dc59f06bedf14d9d8b6a26d760d7733c0fc97
parent5769da0ead8e58b4245dc8b8509f31d117cbeec4
parent4b759fecca748cd6544e0f7d8e93836638ca0053
Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

bin/mozilla/cp.pl
bin/mozilla/cp.pl