Merge remote-tracking branch 'origin/master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Thu, 2 Oct 2014 23:07:54 +0000 (00:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 2 Oct 2014 23:07:54 +0000 (00:07 +0100)
1  2 
src/wx/about_dialog.cc

Simple merge