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

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 1f5c2439964850b0f285f626777838447c5275bc..15b667f9bda20abc897b449663b8f24d63f69c3f 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -122,6 +122,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Mike Blakesley"));
        supported_by.Add (wxT ("Jeff Boot"));
        supported_by.Add (wxT ("Kieran Carroll"));
+       supported_by.Add (wxT ("Matt Carter"));
        supported_by.Add (wxT ("Frank Cianciolo"));
        supported_by.Add (wxT ("Cinema Clarici"));
        supported_by.Add (wxT ("Adam Colt"));