[MERGE] Merged lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Wed, 6 Mar 2013 11:24:25 +0000 (16:54 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Wed, 6 Mar 2013 11:24:25 +0000 (16:54 +0530)
commitd46e9f7384253e115aac200278a8efd78bb5170e
tree04099c0b51e172f4f25c6cd59703dd09f508c486
parent7c5ddd2de0ead278c488fb380992a7a344b4c916
parent5a8497ddebee7590defcd0df5d768a7e2db9e8e4
[MERGE] Merged lp:openobject-addons.

bzr revid: psa@tinyerp.com-20130306112425-simqf72jw4lyvb4g