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

author	Christophe Simonis <chs@openerp.com>
	Wed, 21 Aug 2013 10:31:39 +0000 (12:31 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Wed, 21 Aug 2013 10:31:39 +0000 (12:31 +0200)
commit	208b69723986e79db5a8893cf8540f75720b63bc
tree	7476f251a6a049da1fc2641bcd414dc388382044	tree \| snapshot
parent	c02afb45fa74fb1490b4b4965f987906ee718eb6	commit \| diff
parent	8179683143f880b10f40559a3da48afcfcfcd8ee	commit \| diff

[MERGE] forward port of branch saas-1 up to revid 4899 chs@openerp.com-20130821094758-1ae0d1ml5obufzxv

bzr revid: odo@openerp.com-20130820160346-qcdy4kavgm5cb9t6
bzr revid: chs@openerp.com-20130821103139-zqqbrt8dq6iixrny

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

RSS Atom

doc/changelog.rst	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history