[MERGE] merge with latest trunk
authorRandhir Mayatra rma-openerp <rma@tinyerp.com>
Fri, 11 Apr 2014 06:16:47 +0000 (11:46 +0530)
committerRandhir Mayatra rma-openerp <rma@tinyerp.com>
Fri, 11 Apr 2014 06:16:47 +0000 (11:46 +0530)
commitcbc86bb4eea6c7d579082818abc8e2301d54e4e8
tree9b62bad55ceb5bc889e308c251d5b2a3786551b6
parentdb0fd7aba9ac9af349e0db564fcfe83601a1825f
parent95701c28c014a64c3c5e7a5b9c133269383416b7
[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20140411061647-m6iupt9567igzs4x
openerp/addons/base/res/res_users.py