[MERGE]Merge with Parent
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 17 Jan 2014 14:04:58 +0000 (19:04 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 17 Jan 2014 14:04:58 +0000 (19:04 +0500)
commitd1cc6afe5fe1375ab1519f39e8d6ae3d405d094e
tree1363541afa903f1f09c75aa54c9e0499186d5ca3
parent2ba8b3ec4c24984aabcf6f1c824db383033e0068
parent58907da3ee30be831083f6dcc804c31e7b73df5a
[MERGE]Merge with Parent

bzr revid: pza@tinyerp.com-20140117140458-obuxulf1sfamoi4w