[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Thu, 16 Sep 2010 04:42:20 +0000 (10:12 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Thu, 16 Sep 2010 04:42:20 +0000 (10:12 +0530)
commit2a638a5e23d6758d2318a878c12326246be66410
tree8f3cce55d36122abafc3d3c021aa3809a7305e6e
parent417d27a0df23c0c079663f98968dab9987df6da5
parent3b7bc55e1f7ffd023b127ecdb6be81a9e8eb41f7
[Merge]

bzr revid: vir@tinyerp.com-20100913095609-lpvaem22onbub325
bzr revid: vir@tinyerp.com-20100915043759-um560kpvxgrjls9s
bzr revid: vir@tinyerp.com-20100916044220-ot7i50ampczg74zc
bin/addons/base/base_update.xml
bin/addons/base/res/res_user.py