Merge branch 'master' into divVerent/crypto2

diff --cc all
index 54452f88ba9292b44765cf479f141373fc48e6fb,c9d50d86573be92366b0d03fd1f04309a4bc53f9..158d5df145a155ac24456dbc161808557ebe6d76
--- 1/all
--- 2/all
+++ b/all
@@@ -116,10 -117,9 +117,10 @@@ data/xonotic-nexcompat.pk3dir 
  darkplaces                    |                                                   | div0-stable | svn
  netradiant                    |                                                   | master      |
  div0-gittools                 |                                                   | master      | no
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  data/xonotic-maps.pk3dir      |                                                   | master      |
  mediasource                   |                                                   | master      | no
- fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
+ fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable