Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

author Jan Büren <jan@lx-office-hosting.de>

Tue, 10 Jan 2012 14:59:30 +0000 (15:59 +0100)

committer Jan Büren <jan@lx-office-hosting.de>

Tue, 10 Jan 2012 14:59:30 +0000 (15:59 +0100)
author Jan Büren <jan@lx-office-hosting.de>
Tue, 10 Jan 2012 14:59:30 +0000 (15:59 +0100)
committer Jan Büren <jan@lx-office-hosting.de>
Tue, 10 Jan 2012 14:59:30 +0000 (15:59 +0100)
diff --cc SL/DO.pm
Simple merge
diff --cc SL/Form.pm
Simple merge
diff --cc bin/mozilla/do.pl
Simple merge
author	Jan Büren <jan@lx-office-hosting.de>
	Tue, 10 Jan 2012 14:59:30 +0000 (15:59 +0100)
committer	Jan Büren <jan@lx-office-hosting.de>
	Tue, 10 Jan 2012 14:59:30 +0000 (15:59 +0100)
		1	2
SL/DO.pm	patch \|	diff1 \|	diff2 \|	blob \| history
SL/Form.pm	patch \|	diff1 \|	diff2 \|	blob \| history
bin/mozilla/do.pl	patch \|	diff1 \|	diff2 \|	blob \| history