Merge lp:~matt.hall/endroid/147 into lp:endroid

[Matthew Hall]

Tag the 1.4.7 release.

Tag the 1.4.7 release.

[Phil Connell (pconnell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-14 12:33:54 +0000
+++ debian/changelog	2016-01-04 14:12:17 +0000
@@ -1,3 +1,11 @@
+endroid (1.4.7) trusty; urgency=low
+
+  * Enhance the ldapauth plugin to support LDAP directories that do not
+    allow anonymous access.
+  * Enable twisted logging if traffic logging requested.
+
+ -- Matthew Hall <[e-mail]>  Mon, 04 Jan 2016 14:03:48 +0000
+
 endroid (1.4.6) trusty; urgency=medium
 
   * Bugfixes and robustness improvements for periodic pinger.
 
=== modified file 'setup.py'
--- setup.py	2014-10-14 12:33:54 +0000
+++ setup.py	2016-01-04 14:12:17 +0000
@@ -24,7 +24,7 @@
 
 
 setup(name='endroid',
-      version="1.4.6",
+      version="1.4.7",
       description='EnDroid: a modular XMPP bot',
       url='http://open.ensoft.co.uk/EnDroid',
       packages=[