[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-add-cancel-tch
authorJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 27 Jun 2012 13:55:18 +0000 (19:25 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 27 Jun 2012 13:55:18 +0000 (19:25 +0530)
commit654c4de2bfb17e2ff3c8a455878617d5728ffb35
treeb16400692844639a88986fdbaa9efc1fefbf69e1
parentdeefa50354a7a3b7d2a305dafa38a0510a35cf3f
parenta3b95ebe1f5eae00d8077cdf08d4b6f469c40ddc
[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-add-cancel-tch

bzr revid: jam@tinyerp.com-20120627135518-7q0ndlpfqukir2ar