[MRG] merge with lp:openobject-addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 11 Nov 2013 12:10:29 +0000 (17:40 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 11 Nov 2013 12:10:29 +0000 (17:40 +0530)
commit88ee4db78ab67dcbbbcd6856aedd79e7c5253524
tree951f53fbfd206eee2bee0c1249f3a7af54214989
parentf901a761e0307bd773daf04c065cf673ff11f87c
parent08abc4345a9d60ecd1b956e97066778dca1a90e1
[MRG] merge with lp:openobject-addons

bzr revid: tpa@tinyerp.com-20131111121029-yewf1b0b6bxu4gyh