Merge upstream.

README.md

@@ -13,8 +13,8 @@ Features
   - [CTCP](http://www.irchelp.org/irchelp/rfc/ctcpspec.html)
   - (coming soon) [DCC](http://www.irchelp.org/irchelp/rfc/dccspec.html) and extensions
   - [ISUPPORT/PROTOCTL](http://tools.ietf.org/html/draft-hardy-irc-isupport-00)
-  - [IRCv3.1](http://ircv3.atheme.org/)
-  - (partial, in progress) [IRCv3.2](http://ircv3.atheme.org)
+  - [IRCv3.1](http://ircv3.org/)
+  - (partial, in progress) [IRCv3.2](http://ircv3.org)
 * Callback-based: IRC is an asynchronous protocol and so should a library that implements it be. Callbacks are used to process events from the server.
 * Modularised and extensible: Features on top of RFC1459 are implemented as seperate modules for a user to pick and choose, and write their own. Broad features are written to be as extensible as possible.
 * Liberally licensed: The 3-clause BSD license ensures you can use it everywhere.