Merge branch 'es/contacts-in-subdir'
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)
* es/contacts-in-subdir:
  contacts: fix to work in subdirectories


Trivial merge