[MRG] merge with lp:openerp-web
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 4 Dec 2013 09:08:25 +0000 (14:38 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 4 Dec 2013 09:08:25 +0000 (14:38 +0530)
commit41afa58af05fbb8acb7359db3df382ebe3b0f169
tree2cd0207c026d067959dd5468f8a032c743f36486
parent824e70c090d0ff0227a4727775792e99b200cad6
parentd5aec362a9b091927eda114ddecad070c6462d04
[MRG] merge with lp:openerp-web

bzr revid: tpa@tinyerp.com-20131204090825-b0mkszfp49oe3rb4