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)
commitcd023d8e09e553599d1811e23ed6e51ef8a43e2f
tree446fc9388f0f009db16db4901dbacfd9226dc785
parent454bb4b40055c175aefcb5dbb2d7cd498c734084
parent9bd177af537ccedc008a123a8ba40e45d2132094
Merge branch 'connection-lookup-user' of https://github.com/jaywink/diaspora-api into search