tree d539b0e1502c2a0b2663f312e396505474f6ffe6
parent 0f27b1b25fb995dd7588f5454e2856dad66b88da
parent 7ce2bd2ef88e1cae96c93f9bbe7a890f10b624d2
author Hugo Arès <hugo.ares@ericsson.com> 1497875160 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1497875160 -0400

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Deprecate plugin

Change-Id: I556554a60bfd6f979a9ccfe151bd4f39ba6aea4b