Merge commit 'refs/merge-requests/2276' of git://gitorious.org/rekonq/mainline into...
authorAndrea Diamantini <adjam7@gmail.com>
Tue, 25 May 2010 09:16:32 +0000 (11:16 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Tue, 25 May 2010 09:16:32 +0000 (11:16 +0200)
commit29ee89dfb20af834efd4471ab8bcc953383ffe1f
tree32c37db075ee451bf8eeb31f7bf35f08795e9b42
parent89b55847244ac390e987b7cdc4ce2cc77f9af192
parent7e2da39d7bd331418bd70da47b9aa4ee18c8a3a3
Merge commit 'refs/merge-requests/2276' of git://gitorious.org/rekonq/mainline into m2276
src/bookmarks/bookmarksmanager.cpp
src/mainwindow.cpp
src/urlbar/rsswidget.cpp