[MERGE] with latest trunk server
authorDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Fri, 21 Mar 2014 07:31:41 +0000 (13:01 +0530)
committerDharmraj Jhala (OpenERP) <dizzy.zala@gmail.com>
Fri, 21 Mar 2014 07:31:41 +0000 (13:01 +0530)
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


Trivial merge