[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 28 Apr 2010 05:02:33 +0000 (10:32 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 28 Apr 2010 05:02:33 +0000 (10:32 +0530)
commitda8d8b3d60945f4ff7bb3ab9202556a378cac8ac
treee83a498b7d3b5a96e98f0898ff39df8571f38dec
parentbe8efab7ad95dd8d878676e884891e5521d784ad
parent9a648cdb05ce0f5f948a09829a4be3a114bc4b1a
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20100428050233-4muruzwlrdyulgxq
addons/olap/__openerp__.py
addons/wiki/__openerp__.py