Merge remote-tracking branch 'origin/master' into 2.0

diff --combined src/wx/about_dialog.cc
index 7c59e3fc8aac7ce61e1b8878e8a8523bfa20d7d1,7d66fbca79a08067c3935d87d529d3d2ec29deb5..44e8b935d1312867ef82a533b6a670c55b250fbd
--- 1/src/wx/about_dialog.cc
--- 2/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@@ -1,5 -1,5 +1,5 @@@
  /*
 -    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 +    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
  
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
@@@ -17,10 -17,6 +17,10 @@@
  
  */
  
 +/** @file  src/wx/about_dialog.cc
 + *  @brief The "about DCP-o-matic" dialogue box.
 + */
 +
  #include <wx/notebook.h>
  #include <wx/hyperlink.h>
  #include "lib/version.h"
@@@ -150,7 -146,7 +150,7 @@@ AboutDialog::AboutDialog (wxWindow* par
        supported_by.Add (wxT ("Tim O'Brien"));
        supported_by.Add (wxT ("Ivan Pullman"));
        supported_by.Add (wxT ("Mark Rolfe"));
-       supported_by.Add (wxT ("David Rosenthal"));
+       supported_by.Add (wxT ("David Rozenthal"));
        supported_by.Add (wxT ("Andrä Steiner"));
        supported_by.Add (wxT ("Jussi Siponen"));
        supported_by.Add (wxT ("Lasse Salling"));
@@@ -220,10 -216,6 +220,10 @@@
        SetSizerAndFit (overall_sizer);
  }
  
 +/** Add a section of credits.
 + *  @param name Name of section.
 + *  @param credits List of names.
 + */
  void
  AboutDialog::add_section (wxString name, wxArrayString credits)
  {