Merge branch 'master' into dan_stateless

1 files changed, 0 insertions, 53 deletions

diff --git a/external_libs/python/python-daemon-2.0.5/doc/CREDITS b/external_libs/python/python-daemon-2.0.5/doc/CREDITS
deleted file mode 100644
index feb65d5e..00000000
--- a/external_libs/python/python-daemon-2.0.5/doc/CREDITS
+++ /dev/null
@@ -1,53 +0,0 @@
-Credits for contributors to ‘python-daemon’
-###########################################
-
-:Updated: 2014-12-23
-
-The ‘python-daemon’ library is the work of many contributors.
-
-
-Primary developers
-==================
-
-The library has been maintained over the years by:
-
-* Ben Finney <ben+python@benfinney.id.au>
-* Robert Niederreiter
-* Jens Klein
-
-
-Precursors
-==========
-
-The library code base is inherited from prior work by:
-
-* Chad J. Schroeder
-* Clark Evans
-* Noah Spurrier
-* Jürgen Hermann
-
-
-Additional contributors
-=======================
-
-People who have also contributed substantial improvements:
-
-
-
-..
-    This is free software: you may copy, modify, and/or distribute this work
-    under the terms of the Apache License version 2.0 as published by the
-    Apache Software Foundation.
-    No warranty expressed or implied. See the file ‘LICENSE.ASF-2’ for details.
-
-..
-    Local variables:
-    coding: utf-8
-    mode: text
-    mode: rst
-    time-stamp-format: "%:y-%02m-%02d"
-    time-stamp-start: "^:Updated:[         ]+"
-    time-stamp-end: "$"
-    time-stamp-line-limit: 20
-    End:
-    vim: fileencoding=utf-8 filetype=rst :