# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2016-03-02 22:14:52
# Node ID 5ab361a51ad07c52bff09d227eeec7a7f6fb0776
# Parent  bfa7beb2b01ff049b5b40f3deefafb4d3b8bd0c4
# Parent  b9741e71fc033805d89925f348471708eaee5f97

Merge dev

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -4,3 +4,4 @@ 1e9bc98a5eec8bf73ebb4019d612828807775cf3
 812e073097100155247b2ab698998e604896c37b v5.3.1
 89496c406287f75bdcb8ffaca83b3014bee3ee95 v5.4.0
 8d9f6524a1fd22d5e0f9e34be24f93b2d59f15a7 v5.4.1
+75aa89d1192a128c7c5042c5d365074e2af67a7e v5.4.2
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ def _get_requirements():
 
 
 setup(name='Ennstatus',
-      version='5.4.1-dev',
+      version='5.4.2-dev',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',