tree ed4d6fc442354e5b01de24dbf64c56566bcb9cf4
parent 696f59e1b591c23469433cd7a8e5933c738682c5
parent e0cbff937b0e3ca1855433f8e2f384dc6dadd130
author Hugo Arès <hugo.ares@ericsson.com> 1491867796 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1491867821 -0400

Merge branch 'stable-2.14'

* stable-2.14:
  Expose bouncycastle library in plugin API bazlets
  Add pkg_war bazlet to package web archive

Change-Id: I47ce254ae837e69a25ef9e84a4dcde9fa61de41c