Merge branch 'master' of https://git.autistici.org/djrandom

server/djrandom/mood.old/Makefile

server/djrandom/mood.old/__init__.py

server/djrandom/mood.old/extract_features.py

server/djrandom/mood.old/mood.cc

server/djrandom/mood.old/mood.h

server/djrandom/mood.old/mood.i

server/djrandom/mood.old/mood.py

server/djrandom/mood.old/mood_wrap.cc

server/djrandom/mood.old/setup.py

server/djrandom/mood/Makefile

server/djrandom/mood/feature_extraction.py

server/djrandom/mood/marsyas_c_utils.cc

server/djrandom/mood/marsyas_c_utils.h

server/djrandom/mood/marsyas_c_utils.i

server/djrandom/mood/marsyas_c_utils.py

server/djrandom/mood/marsyas_c_utils_wrap.cc

server/djrandom/mood/marsyas_utils.py

server/djrandom/mood/mood_db.py

server/djrandom/mood/mood_scanner.py

server/setup.py