[MERGE]Merge with Trunk
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Tue, 21 Jan 2014 06:58:01 +0000 (11:58 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Tue, 21 Jan 2014 06:58:01 +0000 (11:58 +0500)
commit19ee94db0ba674a252d73d2a29351ab5c0cf5789
treeb8a595f494b951718d8d3929676629c265e20560
parentd1cc6afe5fe1375ab1519f39e8d6ae3d405d094e
parente516362da433c59333746e5cd527a4dee795a7a2
[MERGE]Merge with Trunk

bzr revid: pza@tinyerp.com-20140121065801-j4332fa4rddax89q