Merge lp:~gingerchris/endroid/new_version into lp:endroid

[ChrisD]

1.4.2 release prep

1.4.2 release prep

[ChrisD (gingerchris)]

review: Needs Fixing

[lp:~gingerchris/endroid/new_version]

90. By Chris Davidson <email address hidden> on 2014-09-15

Update setup.py with new version number

[Phil Connell (pconnell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-05 15:44:58 +0000
+++ debian/changelog	2014-09-15 14:33:59 +0000
@@ -1,3 +1,14 @@
+endroid (1.4.2) trusty; urgency=medium
+
+  * SMS plugin: Fix bugs in its periodic accounting
+  * SMS plugin: Fix bugs in its error handling
+  * Periodicpinger plugin: Reducing logging spam
+  * Rename SMS block commands
+  * Make endroid_remote usable as a library
+  * Other minor cleanup (e.g. the example config file) 
+
+ -- Chris Davidson <[e-mail]>  Mon, 15 Sep 2014 15:05:57 +0100
+
 endroid (1.4.1) precise; urgency=low
 
   * Productisation fixes for SMS plugin: periodic quotas, ACLs.

=== modified file 'setup.py'
--- setup.py	2014-09-05 15:44:58 +0000
+++ setup.py	2014-09-15 14:33:59 +0000
@@ -6,7 +6,7 @@
 from distutils.core import setup
 
 setup(name='endroid',
-      version="1.4.1",
+      version="1.4.2",
       description='EnDroid: a modular XMPP bot',
       url='http://open.ensoft.co.uk/EnDroid',
       packages=[