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

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 5ac732049a80880ef9fa1bd87f158ed28e5b1ff7..d14006ac5196c59a86126c08a74b390688d1807f 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -130,6 +130,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));
+       supported_by.Add (wxT ("Alan Gouger"));
        supported_by.Add (wxT ("Flor Guillaume"));
        supported_by.Add (wxT ("Antonio Ruiz Hernandez"));
        supported_by.Add (wxT ("Jonathan Jensen"));