Merge commit 'refs/merge-requests/203' of git://gitorious.org/rekonq/mainline into m203_2
author Andrea Diamantini
()
committer Andrea Diamantini
()
commit 65aa35dd63fd86ae68de6aaeeb0ac12d3443fde7
tree 701e3430c85ffe0a9d19f6352741f20913973504
parent e8f6b6380347f29e0981c1c92834fbf9b1a98696
parent ef0c5630983853473e1e3c97a4c68baa1d487e6e
Merge commit 'refs/merge-requests/203' of git://gitorious.org/rekonq/mainline into m203_2
src/urlbar/bookmarkwidget.cpp
src/urlbar/bookmarkwidget.h
src/urlbar/rsswidget.cpp
src/urlbar/rsswidget.h