Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 10 Jul 2014 19:38:28 +0000 (20:38 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 10 Jul 2014 19:38:28 +0000 (20:38 +0100)
commit8d58a7c5f4320ad5c111e336c45e44d6b51ab509
tree9db468c1c7fc8bb960c382ba39e5d3b292745254
parent669db59c74217a2ccb6a77d02558907c3e1705a9
parent46f9949259a5402267d1f2809101b4f8c371dc70
Merge master.
ChangeLog
src/lib/playlist.cc
src/wx/config_dialog.cc