tree a8db5bde82b186f4aaec887e0803c13b10592f05
parent 5feb9ee572d6c30054c16824a1dd72b2830aad94
parent 2347925a8c12710393b430385695711a16c9c6a9
author David Pursehouse <dpursehouse@collab.net> 1508820010 +0900
committer David Pursehouse <dpursehouse@collab.net> 1508820010 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Documentation: List all ciphers/MACs available and add some recommendations
  PolyGerrit: Reduce the threshold in gr-watched-projects-editor
  Update polymer to 1.11.0

Change-Id: I3928a1759d3270a0b92dc26e347e07a4b04c0013