Merge branch 'master' into divVerent/crypto2

diff --cc all
index 8f34fdc99587fa1856166432035884ca2f85a54c,6afd6dff9de8ef33a0113815cff93fa33e521b11..2f8a5382d1ccefb7ec762a13aafc245b4f12f698
--- 1/all
--- 2/all
+++ b/all
@@@ -117,9 -117,8 +117,9 @@@ data/xonotic-nexcompat.pk3dir 
  mediasource                   |                                                   | master      |
  darkplaces                    |                                                   | div0-stable | svn
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
- div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
+ div0-gittools                 |                                                   | master      |
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable