Andrew Phillips c97a3e8cc5 Merge remote branch 'origin' ... Conflicts: core/src/main/resources/rest.properties demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java rimuhosting/pom.xml		2010-11-08 11:08:50 +01:00
..
src	Merge remote branch 'origin'	2010-11-08 11:08:50 +01:00
pom.xml	updated to gson 1.5	2010-10-16 10:37:26 -05:00