[MERGE] Merged lp:openobject-addons
authorParamjit Singh Sahota <psa@tinyerp.com>
Wed, 5 Jun 2013 10:50:33 +0000 (16:20 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Wed, 5 Jun 2013 10:50:33 +0000 (16:20 +0530)
commitdcddf07d8b5303ca73834c55120382e73b00994f
tree303d810619aa5a72c12dd5da1957f9e016753a50
parent438fe61061a6d4d35a1db6d7598813297c0ed745
parent5cc8c30adfeccc6db22ebf7487b8e4ebdbe10423
[MERGE] Merged lp:openobject-addons

bzr revid: psa@tinyerp.com-20130605105033-xjishldeso1daws8