Sync with master
commite4c5f6036f64ef0e5e85b1b074d48a148a112377
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2014 21:25:04 +0000 (13 14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Aug 2014 21:25:04 +0000 (13 14:25 -0700)
treecf1aa6759b66b57d6f4922cff8ac672cd0bf7dbe
parent07396f4dab39db2bab6d8b2a230cb46d7e02b12f
parent41ca19b6a6ca5ad6fea246bd400717c16b80b32c
Sync with master

* master:
  tests: fix negated test_i18ngrep calls