From 96b39a15a2c981873ec219766ea13157ae4a734a Mon Sep 17 00:00:00 2001
From: mikey179 <mikey@stubbles.net>
Date: Mon, 29 Sep 2014 11:31:51 +0200
Subject: [PATCH] prepare release

---
 .travis.yml   |  4 ----
 CHANGELOG.md  |  2 +-
 composer.lock | 44 +++++++++++++++++++++++---------------------
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8319d94..fa2b869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,6 @@ php:
   - 5.5
   - 5.6
 
-matrix:
-  allow_failures:
-    - php: 5.6
-
 before_script:
   - "mkdir -p ~/.composer"
   - cp .travis.composer.config.json ~/.composer/config.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26ee41c..2032c95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-4.1.0 (2014-??-??)
+4.1.0 (2014-09-29)
 ------------------
 
   * upgraded stubbles/core to 5.1.0
diff --git a/composer.lock b/composer.lock
index efe3ad5..a71dedf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "stubbles/core",
-            "version": "dev-master",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stubbles/stubbles-core.git",
-                "reference": "2f36a00b4536c72d2fcefca8e056fdf136aade07"
+                "reference": "1c00b616de50a3bf28222a66a66e0516f50351db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stubbles/stubbles-core/zipball/2f36a00b4536c72d2fcefca8e056fdf136aade07",
-                "reference": "2f36a00b4536c72d2fcefca8e056fdf136aade07",
+                "url": "https://api.github.com/repos/stubbles/stubbles-core/zipball/1c00b616de50a3bf28222a66a66e0516f50351db",
+                "reference": "1c00b616de50a3bf28222a66a66e0516f50351db",
                 "shasum": ""
             },
             "require": {
@@ -48,7 +48,7 @@
             ],
             "description": "Provides base classes for Stubbles packages.",
             "homepage": "http://stubbles.net/",
-            "time": "2014-09-24 07:37:36"
+            "time": "2014-09-29 09:07:54"
         }
     ],
     "packages-dev": [
@@ -646,25 +646,28 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d"
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
-                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -677,14 +680,13 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                },
                 {
                     "name": "Kore Nordmann",
                     "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Diff implementation",
@@ -692,7 +694,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2013-08-03 16:46:33"
+            "time": "2014-08-15 10:29:00"
         },
         {
             "name": "sebastian/environment",
@@ -849,17 +851,17 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.5.4",
+            "version": "v2.5.5",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "01a7695bcfb013d0a15c6757e15aae120342986f"
+                "reference": "b1dbc53593b98c2d694ebf383660ac9134d30b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/01a7695bcfb013d0a15c6757e15aae120342986f",
-                "reference": "01a7695bcfb013d0a15c6757e15aae120342986f",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/b1dbc53593b98c2d694ebf383660ac9134d30b96",
+                "reference": "b1dbc53593b98c2d694ebf383660ac9134d30b96",
                 "shasum": ""
             },
             "require": {
@@ -892,7 +894,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-08-31 03:22:04"
+            "time": "2014-09-22 09:14:18"
         }
     ],
     "aliases": [