prep for 1.2.0 release

Paul M. Jones · Paul M. Jones · commit 9908a01b87e2 · 2014-05-31T12:46:17.000-05:00
diff --git a/meta/changes.txt b/meta/changes.txt
@@ -1 +1,5 @@
-- [DOC] Add PHP 5.5 to Travis build, and status badge to README.
+- Merge pull request #24 from jeremykendall/develop; adds support for schemeless URLs and for ftp/ftps schemes
+
+- Merge pull request #23 from jeremykendall/develop; updates allowing parser to handle single label hosts.
+
+- Merge pull request #21 from jeremykendall/develop; updates public suffix list and test data
diff --git a/meta/require.csv b/meta/require.csv
@@ -1,2 +1,2 @@
 php,>=5.4.0
-aura/installer-default,>=1.0.0
+aura/installer-default,1.0.*
