tree afb88ee749728f4db3439271d4ca7589cc6069ae
parent dcb39e9690433514d547f0579d1b4130c59238cb
parent 2e87cd74c1fbe29bc63b488c9b46804a6132fbc0
author David Pursehouse <dpursehouse@collab.net> 1494911583 +0900
committer David Pursehouse <dpursehouse@collab.net> 1494911588 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Add an example of filter in documentation
  Escape "<>" in documentation

Change-Id: I429680746aa98c05001dcd96359dd707e022ce06