Merge.
authorCarl Hetherington <cth@carlh.net>
Sat, 14 Feb 2015 21:37:28 +0000 (21:37 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 14 Feb 2015 21:37:28 +0000 (21:37 +0000)
commite8fc5f57348dd41ac4996f296c98bb7855435c12
treef3d9dbdcad30adc3a34b3d743000bbc96c69e88c
parente2cda13b9da1591f43dfcfd68c03f66622244836
parent66aacf282bb6e76e7e2f2d2ab6be15910d9bdaf9
Merge.
TO_PORT
src/wx/about_dialog.cc