[MRG] merge with main barnch
authorAmit Vora <avo@tinyerp.com>
Fri, 25 Apr 2014 11:52:39 +0000 (17:22 +0530)
committerAmit Vora <avo@tinyerp.com>
Fri, 25 Apr 2014 11:52:39 +0000 (17:22 +0530)
commitc6732c1ba9e17357f694e24d40f6dbf9cf324363
treeffb911e482ec9ff847788db312ebde80e5ea7668
parentc3dbae7f54944567d326c0427706db7b171cbd44
parentbb85882322ed24858e05390de5c7b826d59b1d77
[MRG] merge with main barnch

bzr revid: avo@tinyerp.com-20140423054749-ubsch2zyr0e0617l
bzr revid: avo@tinyerp.com-20140425115239-w1j8zg1dp0ibzn0a