Merge branch 'master' into divVerent/crypto2

diff --cc all
index 64a28e58719d8f9535caa6277a9ff6531d0c4cef,1296bdae9cecb62e4f6f4ae97d19a2e7a3e3236b..ba48d4eed1b76d344faa805b27e501a3f2ca39db
--- 1/all
--- 2/all
+++ b/all
@@@ -113,13 -113,12 +113,13 @@@ repos_urls=
  data/xonotic-data.pk3dir      |                                                   | master      |
  data/xonotic-maps.pk3dir      |                                                   | master      |
  data/xonotic-music.pk3dir     |                                                   | master      |
- data/xonotic-nexcompat.pk3dir |                                                   | master      |
- mediasource                   |                                                   | master      |
+ data/xonotic-nexcompat.pk3dir |                                                   | master      | no
+ mediasource                   |                                                   | master      | no
  darkplaces                    |                                                   | div0-stable | svn
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
- div0-gittools                 |                                                   | master      |
+ div0-gittools                 |                                                   | master      | no
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable