Merge commit 'micah/master'
authorJameson Graef Rollins <jrollins@finestructure.net>
Sat, 15 Nov 2008 23:57:57 +0000 (18:57 -0500)
committerJameson Graef Rollins <jrollins@finestructure.net>
Sat, 15 Nov 2008 23:57:57 +0000 (18:57 -0500)
commitd39039bbc33b3f6cff881114b7accd3e7cffdc94
tree1779f43b83f0c596b0d10a60327b8d89ca73b4c6
parentf5d87b83453aa7888f64b72a74fb16b9d3b65c4a
parenta4983d24c8e79729deaa02602b742eace6d09f86
Merge commit 'micah/master'

Conflicts:

src/monkeysphere-server