Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 30 Sep 2014 19:40:31 +0000 (20:40 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 30 Sep 2014 19:40:31 +0000 (20:40 +0100)
1  2 
src/wx/about_dialog.cc

Simple merge