tree d539b0e1502c2a0b2663f312e396505474f6ffe6
parent 53c6de83e388d36e16b3e457f73029e39e080704
parent b14c80d595daa7847e776f546cc16647d905f021
author Hugo Arès <hugo.ares@ericsson.com> 1497875347 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1497875361 -0400

Merge branch 'stable-2.14'

* stable-2.14:
  Deprecate plugin

Change-Id: I3f20c82b35f8e941d200303aad36b63f87476e8d