Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jan 2014 18:39:07 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jan 2014 18:39:07 +0000 (10:39 -0800)
* maint:
Documentation/gitmodules: Only 'update' and 'url' are required
l10n: de.po: fix translation of 'prefix'

Trivial merge