merge master

rtens · Sep 12, 2013 · 69a4aa9 · 69a4aa9
2 parents 84672a8 + 9ca3db7
commit 69a4aa9
Show file tree

Hide file tree

Showing 76 changed files with 3,294 additions and 3,518 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "watoki/stepper": "*"
     },
     "require-dev": {
-        "rtens/mockster": "1.1.*",
+        "rtens/mockster": "*",
         "watoki/scrut": "*",
         "phpunit/phpunit": "3.7.*"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist