Merge branch 'master' into remotecontrol

Conflicts:
	doc/devblog/day_152__more_ssh_connection_caching.mdwn

1 files changed, 18 insertions, 0 deletions

diff --git a/Utility/URI.hs b/Utility/URI.hs
new file mode 100644
index 000000000..39c2f2289
--- /dev/null
+++ b/Utility/URI.hs
@@ -0,0 +1,18 @@
+{- Network.URI
+ -
+ - Copyright 2014 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+{-# LANGUAGE CPP #-}
+
+module Utility.URI where
+
+-- Old versions of network lacked an Ord for URI
+#if ! MIN_VERSION_network(2,4,0)
+import Network.URI
+
+instance Ord URI where
+	a `compare` b = show a `compare` show b
+#endif