P. Christeas 18b1a8a843 Merge commit 'origin/master' into mdv-gpl3-fwd ...

Conflicts:

	bin/addons/base/ir/ir_actions.py
	bin/netsvc.py
	bin/report/report_sxw.py
	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20081218164925-uarehzvo3ocu0x2w

2008-12-18 18:49:25 +02:00

..

base

Merge commit 'origin/master' into mdv-gpl3-fwd

2008-12-18 18:49:25 +02:00

__init__.py

improved

2008-12-16 19:15:35 +01:00

module_graph.py

passing in GPL-3

2008-11-03 19:27:16 +01:00