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)
commit6bf418bc4cdbbacb964a0e41ab0516a92b58c6a4
treed6bef3710f9009ff506d805d9e9eb9bb7438cce5
parenta143944d4d1abc2aac12e9d591d7a12f593a85bf
parent30590f4c4002772842a053f91622c0367edae463
Merge github.com:ddurvaux/contactdb