[MERGE] merge with main branch
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 6 Jun 2012 06:07:35 +0000 (11:37 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 6 Jun 2012 06:07:35 +0000 (11:37 +0530)
bzr revid: cha@tinyerp.com-20120606060735-g21pgwlnpmpurv1g

1  2 
addons/project/project_view.xml
addons/project/res_config_view.xml

Simple merge
Simple merge