[MERGE] lp:openobject-server
authorJigar Amin - OpenERP <jam@tinyerp.com>
Mon, 13 Aug 2012 06:05:40 +0000 (11:35 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Mon, 13 Aug 2012 06:05:40 +0000 (11:35 +0530)
bzr revid: jam@tinyerp.com-20120713052010-k228m3a5c1zp9gkt
bzr revid: jam@tinyerp.com-20120806065347-w01ssqrxmkyyi7rv
bzr revid: jam@tinyerp.com-20120813060540-4bqbg9ntx0un8qe6

1  2 
openerp/addons/base/ir/ir.xml

Simple merge