Merge branch 'mm/mediawiki-encoding-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:44 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:44 +0000 (12:06 -0700)
commite3798318b12502ae13a8e35e4a385665e810047f
treed8fb6d6d05afc33a7ad37b54ef9caf142da46a63
parent59e0821a81fd82e8aafb8a581d2f001a4ec3e33d
parent9742fb7e53b2f3bd85b5f01e563aee2cad7e77b8
Merge branch 'mm/mediawiki-encoding-fix'

* mm/mediawiki-encoding-fix:
  git-remote-mediawiki: fix encoding issue for UTF-8 media files
  git-remote-mediawiki: allow stop/start-ing the test server