tree 37be8e7de8e222c819798aa095ba372689a9eb5e
parent 0b784b3215a399de753a4db39c0c7118573c3021
parent 1013ceb46e8925a7ef6023640e36bacb7e927332
author David Pursehouse <dpursehouse@collab.net> 1494911525 +0900
committer David Pursehouse <dpursehouse@collab.net> 1494911530 +0900

Merge branch 'stable-2.12' into stable-2.13

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

Change-Id: Ib82930709015f6763cfd04c93f85ccefc35416b5