tree 63060d9d2a8bf86998afde24ee1646b5794d3e92
parent 056a5f8f79f3311ff55c650f9b6aa4a0d877e0f4
parent 0281d690429c061d31528f5a56463d8da1876193
author David Pursehouse <dpursehouse@collab.net> 1529305789 +0900
committer David Pursehouse <dpursehouse@collab.net> 1529305789 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Suppress warnings about usage of deprecated Hashing.md5()
  XDocLoader: Add missing case in switch on DiffMode

Change-Id: Icf1323659e5080d543172aa5d3fb34ee2c27c0d1