tree 236d7134ff0f6b1c29df7cb6c0527c1cf970fb05
parent 0e176f054be8a967542b0612a70b733984a467a0
parent 5adebf57b4584e616757ad1fdd5387861a717181
author David Pursehouse <dpursehouse@collab.net> 1515760462 +0900
committer David Pursehouse <dpursehouse@collab.net> 1515760462 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Documentation: Remove references to optional BouncyCastle libraries

Change-Id: I7a0a6063b96a8655630754c4e3a62d2dd4578c66