From: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed, 25 Sep 2013 06:25:23 +0000 (-0700)
Subject: Merge branch 'es/contacts-in-subdir'
X-Git-Tag: v1.8.5-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb34959e107b0761053662a1498026f856f2ce44;p=thirdparty%2Fgit.git

Merge branch 'es/contacts-in-subdir'

* es/contacts-in-subdir:
  contacts: fix to work in subdirectories
---

eb34959e107b0761053662a1498026f856f2ce44