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)
* 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

Trivial merge