Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 23 Jun 2014 00:02:24 +0000 (01:02 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 23 Jun 2014 00:02:24 +0000 (01:02 +0100)
commitf1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef
treec6bd8a27597855baf86663922294850fd41ece3a
parente6c67f4aac2ca9afc275b6f13058e1e46f2cecc3
parent33755d92926f6e9bf7403f3bde8b1d0645e6a618
Merge master.
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/kdm.cc
src/wx/config_dialog.cc