[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Thu, 29 Sep 2011 05:17:49 +0000 (10:47 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Thu, 29 Sep 2011 05:17:49 +0000 (10:47 +0530)
commit655baa4faef7f17fe941a95aef9ee1bdf784a5bf
treecbc3a44a0bc4e29da15aa94dc8560fede3593334
parent9a4b8c11c2f82dcdbb0a3cf6620ae61365b05c0c
parentbdfaf1e37d64e4f815b5c20bddd90cbd72364c8c
[MERGE]: Merge with lp:openobject-addons

bzr revid: aag@tinyerp.com-20110929051749-9fsvzum91jxzdby2