From: Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Date: Fri, 21 Mar 2014 07:31:41 +0000 (+0530)
Subject: [MERGE] with latest trunk server
X-Git-Tag: InsPy_master01~338^2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=f7621ff8be30e2f9b7b533f8e2c4625132c2ed69;p=odoo%2Fodoo.git

[MERGE] with latest trunk server

bzr revid: pga@tinyerp.com-20140228054414-z2x4vufay1gbbpao
bzr revid: dizzy.zala@gmail.com-20140318065312-uq43i2aiha1kn3d0
bzr revid: dizzy.zala@gmail.com-20140319090323-0srxjge14cw8y4wv
bzr revid: dizzy.zala@gmail.com-20140320064008-fj9merih0wtz6tz6
bzr revid: dizzy.zala@gmail.com-20140321073141-f54b3lqel1l9lgq2
---

f7621ff8be30e2f9b7b533f8e2c4625132c2ed69