[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Tue, 12 Mar 2013 05:00:30 +0000 (10:30 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Tue, 12 Mar 2013 05:00:30 +0000 (10:30 +0530)
commit29e21608829c2d0f8d844c2fffca1d1da1f671ac
treee5cf6c9f15e51027b35f51b250fce02d6d6e5c69
parent6c0a8a22fedddd12d8eb2575ff945de967805f53
parentd2b66d7f249b27d20c55cbbf6f9cd090175ebb1e
[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20130312050030-nyrapukex0nibgi2