Merge commit 'micah/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Feb 2009 01:13:09 +0000 (20:13 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sun, 1 Feb 2009 01:13:09 +0000 (20:13 -0500)
commit2b5cd0f910f28a601bcecfe68cdfc1ffd9b1362c
tree0d4701431f004cacd52995679e7fd28e2af9baa9
parente4c566d5a1dd25d87d07dac1459a395321b9a5ef
parentddb8c65eb135c54fe21e20dafdf7b69a20107703
Merge commit 'micah/master'
src/monkeysphere-authentication