[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 7 Oct 2011 07:22:12 +0000 (12:52 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 7 Oct 2011 07:22:12 +0000 (12:52 +0530)
commitb4abf6e65e17adce0bd2c08ccc7625fa79fa9421
tree7b8377129f521c76b38dc6114a04de008b6c33e1
parent2b52cd1ffb4eb7a39e982d7e3957637bfe31dddf
parent4bee5d20faaaf6478ba40aeb84ad0abe4fe45f7c
[MERGE] branch merged with lp:openobject-addons

bzr revid: mtr@tinyerp.com-20111007072212-r7z3d7y0g4m9jstm