Merge github.com:ddurvaux/contactdb
authorAaron Kaplan <aaron@lo-res.org>
Wed, 23 Oct 2013 06:57:32 +0000 (08:57 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Wed, 23 Oct 2013 06:57:32 +0000 (08:57 +0200)

Trivial merge