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

author	Ravish Murari (OpenERP) <rmu@tinyerp.com>
	Fri, 24 Aug 2012 09:44:59 +0000 (15:14 +0530)
committer	Ravish Murari (OpenERP) <rmu@tinyerp.com>
	Fri, 24 Aug 2012 09:44:59 +0000 (15:14 +0530)
commit	10bfadb6703417348be622ba052f42f4b53203a0
tree	5f65780585ad8dddcaa203c4520f0ebe5b209415	tree \| snapshot
parent	cf3089812ccd8e6911667068e5ea9dc749ed6ee3	commit \| diff
parent	25dd249ecb9aff63aeb13f85d65c0c13d3df8751	commit \| diff

[merge] with latest addons

bzr revid: rmu@tinyerp.com-20120824094459-q4euumikhm3596q8

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

addons/document_page/data/wiki_quickstart.xml	\|	diff2 \|	blob \| history
addons/document_page/web/widgets/rss/feedparser.py	\|	diff2 \|	blob \| history
addons/document_page/wizard/wiki_make_index.py	\|	diff2 \|	blob \| history
addons/document_page/wizard/wiki_make_index_view.xml	\|	diff2 \|	blob \| history
addons/document_page/wizard/wiki_wiki_page_open_view.xml	\|	diff2 \|	blob \| history
addons/procurement/procurement.py	diff1 \|	diff2 \|	blob \| history