[MERGE] merge with parent branch
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Mon, 5 Nov 2012 09:32:02 +0000 (15:02 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Mon, 5 Nov 2012 09:32:02 +0000 (15:02 +0530)
commit241dd4188eb6a0d4dc9375800a6422e0cbebff6a
tree904956af5f41d01c7be9d6b1a4612f1445834492
parentd82d790f6afd9a9f9562626be23708fce7dd9b36
parent6bc15408d6430f219cc1bac65e8f4b0d567ebf22
[MERGE] merge with parent branch

bzr revid: rma@tinyerp.com-20121105093202-rwm0n5in43bym7ye
addons/project/project.py
addons/project/project_view.xml