Merge branch 'ye/http-accept-language'
commit74c91d1f7a1e7848a3614c1c5031755bfa5e80e1
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:24 +0000 (6 15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:25 +0000 (6 15:02 -0800)
treeb7382658010579407ae0ec674aaf8f2272c8be31
parent2588882df9541e4ef2e1fb56e86499283301fbd5
parent93f7d9108a0edf808e1e3bbcdbe6078310c22f9e
Merge branch 'ye/http-accept-language'

Compilation fix for a recent topic in 'master'.

* ye/http-accept-language:
  gettext.c: move get_preferred_languages() from http.c
gettext.h
http.c