Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit

lib/libmd5sum/md5.c

@@ -132,7 +132,7 @@ md5_stream (stream, resblock)
   /* Important: BLOCKSIZE must be a multiple of 64.  */
 #define BLOCKSIZE 4096
   struct md5_ctx ctx;
-  char buffer[BLOCKSIZE + 72];
+  char buffer[BLOCKSIZE + 72] = {0};
   size_t sum;
 
   /* Initialize the computation context.  */

lib/libtuxtxt/tuxtxt_common.h

@@ -704,8 +704,9 @@ void *tuxtxt_CacheThread(void * /*arg*/)
 						tuxtxt_cache.current_subpage[magazine] = -1;
 						continue;
 					}
-
+#if 0	/* ? */
 					b1 &= 3;
+#endif
 					b3 &= 7;
 
 					if (tuxtxt_is_dec(tuxtxt_cache.page_receiving)) /* ignore other subpage bits for hex pages */