Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 14:44:24 +0000 (15:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Sep 2014 14:44:24 +0000 (15:44 +0100)
1  2 
src/wx/config_dialog.cc

Simple merge