[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 2 Apr 2012 05:00:50 +0000 (10:30 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 2 Apr 2012 05:00:50 +0000 (10:30 +0530)
commitfdf35002984150f13bdf6fb2fddf8a7231a6d148
tree989ed42e19a5087d33003ec18dec839f0748ce13
parentd7efca419ab94d243b3e3124b2e4f831a45a51da
parenta996e8500fcff678b37f6d1d5000ef8382d3d0b7
[MERGE]

bzr revid: apa@tinyerp.com-20120402050050-a94x3jrb3xpcubws
addons/project/project.py
addons/project/project_view.xml
addons/project_issue/project_issue.py
addons/project_issue/project_issue_view.xml