Merge branch 'es/contacts-in-subdir'
commiteb34959e107b0761053662a1498026f856f2ce44
authorJonathan Nieder <jrnieder@gmail.com>
Wed, 25 Sep 2013 06:25:23 +0000 (24 23:25 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Wed, 25 Sep 2013 06:25:23 +0000 (24 23:25 -0700)
treedd2007a82eba3a25998dd752a015e0788efa307f
parent1939ce67ed0da6d1819e7c711daaffae2e0a2713
parent8fc9f0227e8ea0461abfd3dc01cf1a51cca0f87f
Merge branch 'es/contacts-in-subdir'

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