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

[MERGE] from trunk

bzr revid: xmo@openerp.com-20121107112516-64hqps4jjgmrs3a4

12 files changed:

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

addons/web/doc/addons.rst	\|	\|	blob
addons/web/doc/conf.py	\|	diff2 \|	blob \| history
addons/web/doc/development.rst	\|	\|	blob
addons/web/doc/getting-started.rst	\|	\|	blob
addons/web/doc/guides/sidebar-protocol.rst	\|	\|	blob
addons/web/doc/old-version.rst	\|	\|	blob
addons/web/doc/production.rst	\|	\|	blob
addons/web/doc/project.rst	\|	\|	blob
addons/web/doc/widgets.rst	\|	\|	blob
addons/web/static/src/js/search.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
setup.py	blob1 \|	blob2 \|	history