merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 24 Aug 2010 12:47:00 +0000 (14:47 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 24 Aug 2010 12:47:00 +0000 (14:47 +0200)
commitad4e36d09b3cf55b67acba2c55174527e12c8fcb
treee7db67010def3c2c8f7aa13938d3a87aac3e114b
parent6a645c2b15b528b8c8489bbb93e0a7cfc2c6617e
parent6c5a917b6c4bdd5cff097c66718ec4d60b07911e
merge

bzr revid: fp@tinyerp.com-20100824124700-mdefo6j77yaifhxc
bin/addons/base/base_update.xml
bin/addons/base/res/res_company.py