Merge with upstream

1 files changed, 7 insertions, 22 deletions

diff --git a/README b/README
index 1e00aec..6612408 100644
--- a/README
+++ b/README
@@ -1,41 +1,26 @@
-luaevent-prosody is a (hopefully temporary) fork of the luaevent library. This fork is
-maintained by Matthew Wild <mwild1@gmail.com>.
-
-Source repository: http://code.matthewwild.co.uk/luaevent-prosody
-
-This luaevent-prosody 0.1.1 release is based on luaevent 0.2.0. See CHANGELOG for more 
-information about the changes.
-
-NOTE: This version of luaevent-prosody depends on the *1.4* branch of libevent - 1.3 can
-      link but will produce erratic behaviour at runtime. I intend to look into this,
-      but don't have time right now - patches welcome.
-
-=== Original README from luaevent 0.2.0 ===
-
 Description: This is a binding of libevent to Lua. It will serve as a drop-in replacement 
 for copas, and eventually support more features (async DNS, HTTP, RPC...).
 
 Contact information:
 Lead:	Thomas Harning <harningt@gmail.com>
 
+Major contributions from prosody project:
+		Matthew Wild: mwild1@gmail.com
+
+
 Project page: http://luaforge.net/projects/luaevent/
 GIT Repositories:
-	git://repo.or.cz/luaevent.git
-	http://repo.or.cz/r/luaevent.git
-Try checking it out and working on it, the 'mob' feature is enabled so you can commit w/:
-git push git+ssh://mob@repo.or.cz/srv/git/luaevent.git master:mob
+	See: https://github.com/harningt/luaevent
 
 Build Requirements:
-	premake (>= 3.3 < 4)
-	libevent (recommend >= 1.3b)
+	libevent (recommend >= 1.4)
 Usage Requirements:
-	libevent (recommend >= 1.3b)
+	libevent (recommend >= 1.4)
 	LuaSocket
 
 See test/ directory for examples of usage.
 
 
 Dependencies:
-	premake - http://premake.sourceforge.net/download
 	libevent - http://monkey.org/~provos/libevent/
 	LuaSocket - http://www.cs.princeton.edu/~diego/professional/luasocket/