OLD 9.0 2016 01 16

Conflict:

diff --cc addons/hr/hr.py
index 30d5e5d,42dad3a..0000000
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@@ -317,8 -317,9 +317,14 @@@ class hr_department(osv.osv)
          return res
  
      def create(self, cr, uid, vals, context=None):
++<<<<<<< HEAD
 +        context = dict(context) if context is not None else {}
 +        context['mail_create_nosubscribe'] = True
++=======
+         if context is None:
+             context = {}
+         context = dict(context, mail_create_nosubscribe=True)
++>>>>>>> odoo/9.0
          # TDE note: auto-subscription of manager done by hand, because currently
          # the tracking allows to track+subscribe fields linked to a res.user record
          # An update of the limited behavior should come, but not currently done.

resolved as

--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -317,8 +317,9 @@ class hr_department(osv.osv):
         return res
 
     def create(self, cr, uid, vals, context=None):
-        context = dict(context) if context is not None else {}
-        context['mail_create_nosubscribe'] = True
+        if context is None:
+            context = {}
+        context = dict(context, mail_create_nosubscribe=True)
         # TDE note: auto-subscription of manager done by hand, because currently
         # the tracking allows to track+subscribe fields linked to a res.user record
         # An update of the limited behavior should come, but not currently done.

Committed into ocb/9.0 as https://github.com/OCA/OCB/commit/1f17b99