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

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index d14006ac5196c59a86126c08a74b390688d1807f..1f5c2439964850b0f285f626777838447c5275bc 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -127,6 +127,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Adam Colt"));
        supported_by.Add (wxT ("Matthias Damm"));
        supported_by.Add (wxT ("Alexey Derevyanko"));
+       supported_by.Add (wxT ("Unwana Essien"));
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));