[MERGE] with trunk,
authorNimesh Contractor (OpenERP) <nco@tinyerp.com>
Mon, 22 Jul 2013 05:44:25 +0000 (11:14 +0530)
committerNimesh Contractor (OpenERP) <nco@tinyerp.com>
Mon, 22 Jul 2013 05:44:25 +0000 (11:14 +0530)
commiteebb294427e185f14e894eecdbd112de3589b23f
tree09188ad91eea483cf6c2034c6d2e65079a5608df
parent59a1efef9ff955633217b8fdc9732872b673d276
parent1d82442202c9a632ef67b10e12d75c2ed9861a00
[MERGE] with trunk,

bzr revid: nco@tinyerp.com-20130722054425-idq5mgulodzlrxpx