[MERGE] merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 14 Aug 2012 07:20:47 +0000 (12:50 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 14 Aug 2012 07:20:47 +0000 (12:50 +0530)
commit7b517425e4b197f8d38ad407bf99bdd65bc66514
tree125cc137963e7add5408df349bbfde5f0393a6f3
parent86768264f4e0027d62ac300410a8ef691e95d862
parentb97e2ddd8017c59f26dc92981f1286602d5ca9cb
[MERGE] merge with parent branch

bzr revid: fka@tinyerp.com-20120814072047-6q3yruttlzar6yh8