build.xml | 1 1 + 0 - 0 !
src/conf/MANIFEST.MF | 47 47 + 0 - 0 !
2 files changed, 48 insertions(+)

 adds the osgi metadata to the manifest

src/java/org/apache/commons/collections/MultiHashMap.java | 2 1 + 1 - 0 !
src/java/org/apache/commons/collections/MultiMap.java | 2 1 + 1 - 0 !
src/java/org/apache/commons/collections/map/MultiKeyMap.java | 2 1 + 1 - 0 !
src/java/org/apache/commons/collections/map/MultiValueMap.java | 2 1 + 1 - 0 !
src/test/org/apache/commons/collections/TestMultiHashMap.java | 16 8 + 8 - 0 !
src/test/org/apache/commons/collections/map/TestMultiKeyMap.java | 4 2 + 2 - 0 !
src/test/org/apache/commons/collections/map/TestMultiValueMap.java | 18 9 + 9 - 0 !
7 files changed, 23 insertions(+), 23 deletions(-)

 renames the multimap.remove(object, object) method to removemapping()
 and MultiKeyMap.remove(Object, Object) to removeMultiKey(). This avoids a conflict
 with the new Map.remove(Object, Object) method introduced in Java 8. The new names
 are those used by Commons Collections 4 (packaged as libcommons-collections4-java).