Merged stable into default

Menno Smits · Menno Smits · commit 661bf54db035 · 2016-06-07T23:29:44.000+12:00
diff --git a/.hgtags b/.hgtags
@@ -23,3 +23,4 @@ b1f516b3b41579a18793171728a65e956dbc7d0e 0.10.1
 10c1e06ec8f27f48eb118ce7fdd988143d3cfc59 0.12
 c076ec55a74f8ae8195dbac440fd0c83b89eafb8 0.13
 743bdffc5a3608fcba1261a27d82ba51132ee1d3 1.0.0
+36f7e81f7fe2c15c71512c30fbce5df6914edc83 1.0.1
diff --git a/README.rst b/README.rst
@@ -105,11 +105,23 @@ scheme from version 1.0 onwards.
 Mailing List
 ------------
 The IMAPClient mailing list can be used to ask IMAPClient related
-questions and report bugs.
-
-- To send to the list and subscribe send an email to imapclient@librelist.com
-- Archives of the list are available at http://librelist.com/browser/imapclient/
-- See http://librelist.com/help.html for more information about the mailing list
+questions and report bugs. Details of new releases and project changes
+will also be announced there.
+
+The mailing list is hosted at `Groups.io
+<http://groups.io>`_. Interaction via both email and the web is
+supported. To join the list, see the list archives or just find out
+more, visit https://groups.io/g/imapclient. The key details of the
+list are:
+
+* Post: imapclient@groups.io
+* Subscribe: imapclient+subscribe@groups.io
+* Unsubscribe: imapclient+unsubscribe@groups.io
+* Web: https://groups.io/g/imapclient
+* Web archives: https://groups.io/g/imapclient/messages
+
+If you're having trouble using the mailing list, please email
+menno@freshfoo.com.
 
 Working on IMAPClient
 ---------------------
diff --git a/doc/src/index.rst b/doc/src/index.rst
@@ -9,7 +9,7 @@
 :Download: http://pypi.python.org/pypi/IMAPClient/
 :Documentation: http://imapclient.readthedocs.org/
 :License: `New BSD License <http://en.wikipedia.org/wiki/BSD_licenses>`_
-:Support: `Mailing List <http://librelist.com/browser/imapclient/>`_
+:Support: `Mailing List <https://groups.io/g/imapclient>`_
 
 Introduction
 ------------
diff --git a/interact.py b/interact.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (c) 2014, Menno Smits
 # Released subject to the New BSD License
diff --git a/livetest.py b/livetest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Copyright (c) 2014, Menno Smits
 # Released subject to the New BSD License

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/python`
	`1`	`+#!/usr/bin/env python`
`2`	`2`
`3`	`3`	`# Copyright (c) 2014, Menno Smits`
`4`	`4`	`# Released subject to the New BSD License`