tree ca6cd962dcd5086ca13fde90c94d2b9125e4c575
parent 7221ee6469c38c7efae34579b8155ad285b85901
parent d2ee4d21f0a9b00dc76bd8d7f3142b48ba8a61e1
author David Pursehouse <dpursehouse@collab.net> 1559197550 +0900
committer David Pursehouse <dpursehouse@collab.net> 1559197550 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Revert "Remove explicit dependency on commons-codec"

No-op merge because we don't want to reintroduce the dependency
on commons-codec in this branch.

Change-Id: Idc26e3c25667ea9d22c5b5ca9f8c61c382fdd87b