Files
spring-data-redis/src/test/java/org
Jennifer Hickey 9642b7ea72 Merge branch 'DATAREDIS-117' of github.com:porcelijn/spring-data-redis into porcelijn-DATAREDIS-117
Conflicts:
	src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
	src/test/java/org/springframework/data/redis/connection/jedis/JedisConnectionIntegrationTests.java
2013-03-19 09:46:04 -07:00
..