git.inspyration.org Git - odoo/odoo.git/commit

author	Christophe Simonis <chs@openerp.com>
	Tue, 18 Mar 2014 12:41:12 +0000 (13:41 +0100)
committer	Christophe Simonis <chs@openerp.com>
	Tue, 18 Mar 2014 12:41:12 +0000 (13:41 +0100)
commit	8f8ca3bd843a02bf44fe04e96365818a0b4468c8
tree	5b92f814a0a4d84151e7bbc62f3c55e8ed4913fd	tree \| snapshot
parent	a2f9619e267a45d0959e7a942ba4e520d91fbb94	commit \| diff
parent	a7cdda3ba6529e19ca19a168a573f9484e48bf9a	commit \| diff

[MERGE] forward port of branch saas-3 up to revid 5093 chs@openerp.com-20140318114540-l50kmo4azb57g31x

bzr revid: chs@openerp.com-20140318124112-cj65l3wysk2rhwlw

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

openerp/addons/base/tests/test_base.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_ir_sequence.py	diff1 \|	\|	blob \| history
openerp/addons/test_impex/tests/test_export.py	diff1 \|	\|	blob \| history
openerp/http.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history