Merge branch 'master' into cache_range

Conflicts:
	music.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/config.cpp b/config.cpp
index 68e8a2f..910d0f0 100644
--- a/config.cpp
+++ b/config.cpp
@@ -14,6 +14,7 @@ void config::init() {
 		("audist.telnetd_port", po::value<int>()->default_value(7681), "telnetd port")
 		("audist.threads", po::value<std::size_t>()->default_value(10), "threads")
 		("audist.database", po::value<std::string>(), "database string")
+		("audist.cache_dir", po::value<std::string>(), "cache dir")
 	;
 	std::ifstream is("audist.conf", std::ios::in);
 	po::store(po::parse_config_file(is, desc, true), vm);