OLD 8.0 2015 06 18

Conflict:

--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -567,8 -567,7 +567,12 @@@
    border-radius: 3px;
    background: #f0f0fa;
    color: #4C4C4C;
++<<<<<<< HEAD
 +  white-space: nowrap;
 +  display: inline-block;
++=======
+   word-break: break-word;
++>>>>>>> odoo/8.0
  }
  .openerp .oe_tag_dark {
    background: #7C7BAD;
diff --cc addons/web/static/src/css/base.sass
index 272d6e0,f45ee52..0000000
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@@ -516,8 -516,7 +516,12 @@@ $sheet-padding: 16p
          @include radius(3px)
          background: $tag-bg-light
          color: #4C4C4C
++<<<<<<< HEAD
 +        white-space: nowrap
 +        display: inline-block
++=======
+         word-break: break-word
++>>>>>>> odoo/8.0
      .oe_tag_dark
          background: $tag-bg-dark
          color: #eee

Resolved as:

--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@@ -567,8 -567,7 +567,9 @@@
    border-radius: 3px;
    background: #f0f0fa;
    color: #4C4C4C;
 +  white-space: nowrap;
 +  display: inline-block;
+   word-break: break-word;
  }
  .openerp .oe_tag_dark {
    background: #7C7BAD;
diff --cc addons/web/static/src/css/base.sass
index 272d6e0,f45ee52..0000000
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@@ -516,8 -516,7 +516,9 @@@ $sheet-padding: 16p
          @include radius(3px)
          background: $tag-bg-light
          color: #4C4C4C
 +        white-space: nowrap
 +        display: inline-block
+         word-break: break-word
      .oe_tag_dark
          background: $tag-bg-dark
          color: #eee

Merging both changes from https://github.com/odoo/odoo/commit/4fbecc35e1d37253ef9470208cafd0d2739f57f4 which fixes overflowing on tags with very long words, and https://github.com/OCA/OCB/commit/852df8cd3b28757fa4cc836ce7a37d067dcb624e which fixes outlining in the case of very long tags

Committed as https://github.com/OCA/OCB/commit/a2bb410254d58f15afa8e2de2e977b352514d3b1 by @StefanRijnhart