Merge tag 'branchpoint-5.1' into release

Branch point for 5.1 release.

Conflicts:
	configure.ac
	debian/changelog

diff --cc configure.ac
index 1e08101be9ae874ce8a72908e0807fb8f6e616bb,e47aca290efb7473bc1786087a980560ccd1b7c2..a07f74d5f21e9b92e089ffca542ada4cb419c936
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,11 -18,12 +18,12 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  
- AC_INIT([disorder], [5.0.3], [richard+disorder@sfere.greenend.org.uk])
 -AC_INIT([disorder], [5.0.DEV], [richard+disorder@sfere.greenend.org.uk])
++AC_INIT([disorder], [5.1], [richard+disorder@sfere.greenend.org.uk])
  AC_CONFIG_AUX_DIR([config.aux])
- AM_INIT_AUTOMAKE(disorder, [5.0.3])
 -AM_INIT_AUTOMAKE(disorder, [5.0.DEV])
++AM_INIT_AUTOMAKE(disorder, [5.1])
  AC_CONFIG_SRCDIR([server/disorderd.c])
  AM_CONFIG_HEADER([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
  
  # Find host type
  AC_CANONICAL_HOST

diff --cc debian/changelog
index 331ec122186306d84dd68c5b3eaae89e68a1a586,52be205907609ad4ec73cfe6038542012b5afd5c..793454279ec902192f9f89d0265a44030cbbba51
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,8 +1,28 @@@
 -disorder (5.0.DEV) unstable; urgency=low
++disorder (5.1) stable; urgency=low
+ 
 -  * Development version.
++  * DisOrder 5.1
+ 
 - -- Richard Kettlewell <rjk@greenend.org.uk>  Sat, 12 Feb 2011 15:44:33 +0000
++ -- Richard Kettlewell <rjk@terraraq.org.uk>  Sun, 17 Feb 2013 16:22:14 +0000
++
 +disorder (5.0.3) stable; urgency=emergency
 +
 +  * Security: Local connections can no longer create and delete users
 +    unless they are properly authorized.
 +
 + -- Richard Kettlewell <rjk@greenend.org.uk>  Sun, 31 Jul 2011 17:07:59 +0100
 +
 +disorder (5.0.2) unstable; urgency=low
 +
 +  * Mention login cookie.
 +
 + -- Richard Kettlewell <rjk@greenend.org.uk>  Sat, 28 May 2011 11:54:52 +0100
 +
 +disorder (5.0.1) unstable; urgency=low
 +
 +  * Disorder 5.0.1
 +  * The sense of the Control -> Playing menu item was fixed.
 +
 + -- Richard Kettlewell <rjk@greenend.org.uk>  Thu, 10 Jun 2010 09:18:58 +0100
  
  disorder (5.0) unstable; urgency=low