make 2.0 branch into trunk
authorMatthew Jason Benson <mbenson@apache.org>
Wed, 19 Mar 2014 18:30:46 +0000 (18:30 +0000)
committerMatthew Jason Benson <mbenson@apache.org>
Wed, 19 Mar 2014 18:30:46 +0000 (18:30 +0000)
commit3d0c564260854e1bd13147da0cd6364d2671cc74
tree33f8d9099381fd42c6eb811fc31f06b345755c24
parent5d2c38ef6a33e0cae1a63d5c7b209cc077a61044
parent129333fc3b8fce748e00141d368a9297d2d1d1e0
make 2.0 branch into trunk

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