Merge from 3.0 fixes branch

diff --cc CHANGES
Simple merge

diff --cc lib/trackdb.c
Simple merge

diff --cc lib/trackdb.h
index e39de6e419454b6494a7dd010c7f2529dbaf4a12,e100f2594bd82ed4c6d4d4a8c6db41f4482fa54e..f372f4cf0586e9fbe57e6fa3138a157d10d5eacc
--- 1/lib/trackdb.h
--- 2/lib/trackdb.h
+++ b/lib/trackdb.h
@@@ -171,12 -171,8 +171,13 @@@ int trackdb_edituserinfo(const char *us
  char **trackdb_listusers(void);
  int trackdb_confirm(const char *user, const char *confirmation,
                      rights_type *rightsp);
+ int trackdb_readable(void);
  
 +typedef void random_callback(struct ev_source *ev,
 +                             const char *track);
 +int trackdb_request_random(struct ev_source *ev,
 +                           random_callback *callback);
 +
  #endif /* TRACKDB_H */
  
  /*