[MERGE] Merge with addons
authorJaydeep Barot <jar@tinyerp.com>
Fri, 25 Apr 2014 05:53:10 +0000 (11:23 +0530)
committerJaydeep Barot <jar@tinyerp.com>
Fri, 25 Apr 2014 05:53:10 +0000 (11:23 +0530)
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl


Trivial merge