[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Fri, 17 Sep 2010 04:46:37 +0000 (10:16 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Fri, 17 Sep 2010 04:46:37 +0000 (10:16 +0530)
bzr revid: vir@tinyerp.com-20100917044637-wibq5m44v57d82gk

1  2 
bin/addons/base/res/res_user.py

Simple merge