Merge branch 'master' of git://labs.riseup.net/~micah/monkeysphere
authorMatthew James Goins <mjgoins@openflows.com>
Mon, 11 Jan 2010 00:03:50 +0000 (19:03 -0500)
committerMatthew James Goins <mjgoins@openflows.com>
Mon, 11 Jan 2010 00:03:50 +0000 (19:03 -0500)
commit749f1d84177c993d6382c1f80737e21d9fb1ee7b
tree07a17d9181c7d711365401cb819ea940c2bc16bf
parent9a3c85827f90722036a8f6a2b81a2926ea088ff3
parentbcec6b61fb874910e17bb3762c823745ae12bd1c
Merge branch 'master' of git://labs.riseup.net/~micah/monkeysphere
src/monkeysphere
src/monkeysphere-authentication