[MERGE] Merge warning changes
authorSbh (Openerp) <sbh@tinyerp.com>
Fri, 15 Jun 2012 05:19:15 +0000 (10:49 +0530)
committerSbh (Openerp) <sbh@tinyerp.com>
Fri, 15 Jun 2012 05:19:15 +0000 (10:49 +0530)
commit9e84dba22c20e3a2fca1ee69f94db77030e1e54a
treeaf4cc72b85f1db24a870b85f32aa2d926691c9d7
parent3c0086ac8cfadccc54119de4c53841d1d79d23a2
parent4a42b0eb4e3ccce3f2c006684d157075dbd28c95
[MERGE] Merge warning changes

bzr revid: sbh@tinyerp.com-20120615051915-35ne8oxoqxxa2i5i