Merge branch 'master' of /git/disclosr
[disclosr.git] / couchdb / settee
1