OLD 7.0 2015 03 27

Conflict:

diff --cc addons/web_kanban/static/src/js/kanban.js
index c45c59c,60e7f1e..0000000
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@@ -647,10 -649,12 +647,18 @@@ instance.web_kanban.KanbanGroup = insta
      },
      do_show_more: function(evt) {
          var self = this;
++<<<<<<< HEAD
++=======
+         var ids = self.view.dataset.ids.slice(0);
++>>>>>>> odoo/7.0
          return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
              'limit': self.view.limit,
              'offset': self.dataset_offset += self.view.limit
          }).then(function(records) {
++<<<<<<< HEAD
++=======
+             self.view.dataset.ids = ids.concat(_.difference(self.dataset.ids, ids));
++>>>>>>> odoo/7.0
              self.do_add_records(records);
              self.compute_cards_auto_height();
              self.view.postprocess_m2m_tags();

resolved by git checkout --theirs addons/web_kanban/static/src/js/kanban.js

The conflict was introduced in https://github.com/OCA/OCB/commit/747ea8fa53da7e31c1af8b08ee5528161801de1c, but https://github.com/odoo/odoo/commit/2a0c018043ddcc40074bb46e63bce46f191d459d corrects this behavior.

Committed as https://github.com/OCA/OCB/commit/a6cc3f9 by @hbrunn