Merge remote branch 'coling/history'

diff --cc src/Makefile.am
Simple merge

diff --cc src/map-file
Simple merge

diff --cc src/modules/module-stream-restore.c
index 1e2dc4df5bbc80c4c0985724cc73fd488bb92387,b7b36be48e87abd8d6ecd0869a86ad99f4079b47..788f458b78e12224bfcef9aa0d3e41eff15bee11
--- 1/src/modules/module-stream-restore.c
--- 2/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@@ -1122,21 -281,10 +1122,21 @@@ static pa_bool_t entries_equal(const st
  
  static void subscribe_callback(pa_core *c, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
      struct userdata *u = userdata;
-     struct entry entry, *old;
-     char *name;
+     struct entry entry, *old = NULL;
+     char *name = NULL;
      pa_datum key, data;
  
 +    /* These are only used when D-Bus is enabled, but in order to reduce ifdef
 +     * clutter these are defined here unconditionally. */
 +    pa_bool_t created_new_entry = TRUE;
 +    pa_bool_t device_updated = FALSE;
 +    pa_bool_t volume_updated = FALSE;
 +    pa_bool_t mute_updated = FALSE;
 +
 +#ifdef HAVE_DBUS
 +    struct dbus_entry *de = NULL;
 +#endif
 +
      pa_assert(c);
      pa_assert(u);