Conflict:

diff --cc openerp/modules/loading.py
index 47a3b9e,5c35724..0000000
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@@ -452,8 -453,8 +452,13 @@@ def load_modules(db, force_demo=False, 
          t0 = time.time()
          t0_sql = openerp.sql_db.sql_counter
          if openerp.tools.config['test_enable']:
++<<<<<<< HEAD
 +            if update_module and mods:
 +                cr.execute("SELECT name FROM ir_module_module WHERE state='installed' and name in %s", (tuple(mods),))
++=======
+             if update_module:
+                 cr.execute("SELECT name FROM ir_module_module WHERE state='installed' and name = ANY(%s)", (processed_modules,))
++>>>>>>> odoo/heads/8.0
              else:
                  cr.execute("SELECT name FROM ir_module_module WHERE state='installed'")
              for module_name in cr.fetchall():

resolved by using the odoo version. Committed in OCB as github.com/OCA/OCB@0c2734a440