Merge branch 'ah/stripspace-optstring' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:19 +0000 (13:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:19 +0000 (13:10 -0800)
* ah/stripspace-optstring:
stripspace: call U+0020 a "space" instead of a "blank"

Trivial merge