[MERGE] forward port of branch 7.0 up to af37b30
authorChristophe Simonis <chs@odoo.com>
Fri, 26 Sep 2014 10:33:17 +0000 (12:33 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 26 Sep 2014 10:33:17 +0000 (12:33 +0200)
1  2 
openerp/addons/base/ir/ir_cron.py
openerp/addons/base/res/res_users.py

Simple merge
Simple merge