Merge commit 'refs/merge-requests/90' of git://gitorious.org/rekonq/mainline into ThursdayFixes
author Andrea Diamantini
()
committer Andrea Diamantini
()
commit acc10a5216cdb29de479a9eb62c6765cb6e196ae
tree 7e7cc3874c0c72beeaf154f6330b5046ad7f6fac
parent eaeb2fd551b212eff656b65169ce98ca20485370
parent 8f65c4ad86e65f30935cec1c459d59fcd23fda18
Merge commit 'refs/merge-requests/90' of git://gitorious.org/rekonq/mainline into ThursdayFixes
src/mainwindow.cpp
src/settings/settingsdialog.cpp