| commit | c97a3e8cc5ba46ad80bc4689262e992e6ee9e1a1 | [log] [tgz] |
|---|---|---|
| author | Andrew Phillips <demobox1@yahoo.co.uk> | Mon Nov 08 11:08:50 2010 +0100 |
| committer | Andrew Phillips <demobox1@yahoo.co.uk> | Mon Nov 08 11:08:50 2010 +0100 |
| tree | 1dbb26d957cd0ff783a8ea3bb59c7356a0952cc0 | |
| parent | 81c954c26c87a716a9eea29e53a52e86fff7b0a3 [diff] | |
| parent | 4dbcbfc7a633b2abfb1db97d3c070ef15141c973 [diff] |
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