Merge branch 'connection-lookup-user' of https://github.com/jaywink/diaspora-api...
authorMarek Marecki <triviuss@gmail.com>
Sat, 6 Jul 2013 20:12:39 +0000 (22:12 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sat, 6 Jul 2013 20:12:39 +0000 (22:12 +0200)

Trivial merge