Merge branch 'refs/heads/master' into multimodule

Conflicts: build.gradle gradle/wrapper/gradle-wrapper.jar gradle/wrapper/gradle-wrapper.properties
betamaxteam · Aug 5, 2013 · 31b9e4a · 31b9e4a
2 parents 30f0983 + f52cf06
commit 31b9e4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed Jul 31 11:12:33 BST 2013
+#Tue Sep 18 21:29:51 BST 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/readme.md b/readme.md
@@ -23,9 +23,9 @@ Full documentation can be found on [Betamax's home page][home].
 
 ## Project status
 
-The current stable version of Betamax is 1.1.1 which is available from [Maven Central][mavenrepo].
+The current stable version of Betamax is 1.1.2 which is available from [Maven Central][mavenrepo].
 
-Add `'co.freeside:betamax:1.1.1'` as a test dependency to your [Gradle][gradle], [Ivy][ivy], [Grails][grails] or [Maven][maven] project (or anything that can use Maven repositories).
+Add `'co.freeside:betamax:1.1.2'` as a test dependency to your [Gradle][gradle], [Ivy][ivy], [Grails][grails] or [Maven][maven] project (or anything that can use Maven repositories).
 
 Development versions are available from [Sonatype][sonatype].