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

author	Ajay Chauhan (OpenERP) <cha@tinyerp.com>
	Fri, 31 Aug 2012 05:17:39 +0000 (10:47 +0530)
committer	Ajay Chauhan (OpenERP) <cha@tinyerp.com>
	Fri, 31 Aug 2012 05:17:39 +0000 (10:47 +0530)
commit	5af24918fd8962cf923fcc0f8b2ae579acee130b
tree	21c60a0285024eeccaef8325a6d71140985a116c	tree \| snapshot
parent	d5dcfe4f553b0804a1769b617f53d38828cae9cc	commit \| diff
parent	4639967d0ceb5db0ba1a12d89c7c46d1db012f63	commit \| diff

[MERGE] merge with main addons

bzr revid: cha@tinyerp.com-20120831051739-95um0c4jj4ir96nt

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

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/project/project.py	diff1 \|	diff2 \|	blob \| history