[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)
commitfe8106fb85c5b0ba8d59fd95f44cde6379c3dec5
tree546b4aeb4946583e61a2b1095443ebcf86d432fd
parent0305010f2ff553798102b806758974f354325112
parentaf37b3022b9dc944e88846dd58135de758798928
[MERGE] forward port of branch 7.0 up to af37b30
openerp/addons/base/ir/ir_cron.py
openerp/addons/base/res/res_users.py