tree 81eafe08a0625273ec51b86a20859117fb1b7aa3
parent 693779caa06c3f78a41a51b28f67f4132ec26832
parent 3c165ee2d9c4aff91ea5e89a98aa177c16517cd1
author David Pursehouse <dpursehouse@collab.net> 1494911552 +0900
committer David Pursehouse <dpursehouse@collab.net> 1494911556 +0900

Merge branch 'stable-2.13' into stable-2.14

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

Change-Id: I314d6b722c1378ed31ce87168527998e90e56e78