Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 15 Aug 2008 22:04:53 +0000 (15:04 -0700)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 15 Aug 2008 22:10:02 +0000 (15:10 -0700)
commit46586fc0f24e24166a52c2a0efb3e2ab838eea81
tree4e1986278410f4e90e3a5ec70b11b10b14d67220
parentcb05f332e617e346aa533d6dde02fb11c6148799
parentc9acc1237d8e21d74fe7070af1b061c888664e8b
Merge commit 'dkg/master'

Conflicts:

debian/changelog
debian/changelog
src/monkeysphere-server