Fix #694 - Norwegian collation

4 files changed, 14 insertions, 12 deletions

diff --git a/vendor/ramsey/uuid/CHANGELOG.md b/vendor/ramsey/uuid/CHANGELOG.md
index d686aeb62c..73ece7933c 100644
--- a/vendor/ramsey/uuid/CHANGELOG.md
+++ b/vendor/ramsey/uuid/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Rhumsaa\Uuid Changelog
 
+## 2.8.3
+
+_Released: 2015-08-31_
+
+  * Fix exception message in `Uuid::calculateUuidTime()`.
+  * Update composer.json to reflect new repository and package name.
+
 ## 2.8.2
 
 _Released: 2015-07-23_
diff --git a/vendor/ramsey/uuid/README.md b/vendor/ramsey/uuid/README.md
index 00702fc19a..d5b3e56fec 100644
--- a/vendor/ramsey/uuid/README.md
+++ b/vendor/ramsey/uuid/README.md
@@ -1,9 +1,5 @@
 # Rhumsaa\Uuid for PHP
 
-_**WARNING: This package is no longer maintained. Use [ramsey/uuid](https://github.com/ramsey/uuid) instead.**_
-
-----
-
 [![Build Status](https://travis-ci.org/ramsey/uuid.png?branch=master)](https://travis-ci.org/ramsey/uuid)
 [![Coverage Status](https://coveralls.io/repos/ramsey/uuid/badge.png)](https://coveralls.io/r/ramsey/uuid)
 [![Latest Stable Version](https://poser.pugx.org/rhumsaa/uuid/v/stable.png)](https://packagist.org/packages/rhumsaa/uuid)
diff --git a/vendor/ramsey/uuid/composer.json b/vendor/ramsey/uuid/composer.json
index a02198dec2..6128c033ad 100644
--- a/vendor/ramsey/uuid/composer.json
+++ b/vendor/ramsey/uuid/composer.json
@@ -1,9 +1,9 @@
 {
-    "name": "rhumsaa/uuid",
-    "description": "NO LONGER MAINTAINED. Use ramsey/uuid instead. A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+    "name": "ramsey/uuid",
+    "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
     "type": "library",
     "keywords": ["uuid", "identifier", "guid"],
-    "homepage": "https://github.com/ramsey/rhumsaa-uuid",
+    "homepage": "https://github.com/ramsey/uuid",
     "license": "MIT",
     "authors": [
         {
@@ -16,8 +16,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/ramsey/rhumsaa-uuid/issues",
-        "source": "https://github.com/ramsey/rhumsaa-uuid"
+        "issues": "https://github.com/ramsey/uuid/issues",
+        "source": "https://github.com/ramsey/uuid"
     },
     "require": {
         "php": ">=5.3.3"
diff --git a/vendor/ramsey/uuid/src/Uuid.php b/vendor/ramsey/uuid/src/Uuid.php
index 1d3f143756..1a5d80661b 100644
--- a/vendor/ramsey/uuid/src/Uuid.php
+++ b/vendor/ramsey/uuid/src/Uuid.php
@@ -93,7 +93,7 @@ final class Uuid
     /**
      * Version of the Rhumsaa\Uuid package
      */
-    const VERSION = '2.8.2';
+    const VERSION = '2.8.3';
 
     /**
      * For testing, 64-bit system override; if true, treat the system as 32-bit
@@ -1112,8 +1112,7 @@ final class Uuid
 
         throw new Exception\UnsatisfiedDependencyException(
             'When calling ' . __METHOD__ . ' on a 32-bit system, '
-            . 'Moontoast\Math\BigNumber must be present in order '
-            . 'to generate version 1 UUIDs'
+            . 'Moontoast\Math\BigNumber must be present'
         );
     }