tree 2b77fc2dd585488923667493c2a9b4622dcf491f
parent 55cd95f277b1a6f5f50d0dbf064beeb092fc6019
parent 5f189531914e2974558228d49d21d1cbfc3909ce
author Thomas Vandahl <tv@apache.org> 1486655822 +0000
committer Thomas Vandahl <tv@apache.org> 1486655822 +0000

Merge changes from 2.1 release branch back into trunk

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jcs/trunk@1782354 13f79535-47bb-0310-9956-ffa450edef68