Merge commit 'refs/merge-requests/124' of git://gitorious.org/rekonq/mainline into m124
author Andrea Diamantini
()
committer Andrea Diamantini
()
commit d81fcde14089fee3a1c64fc647f4cc77c9efd7af
tree 16a6d09cc778d553b0b5f90bff83c6e3bad532b9
parent 5abfd807fcadc72235872ee874bef85246001a88
parent 5a731041a743ccdeaeb91e30f420cd19676e63dd
Merge commit 'refs/merge-requests/124' of git://gitorious.org/rekonq/mainline into m124
src/bookmarks/bookmarksmanager.cpp
src/bookmarks/bookmarksmanager.h
src/mainwindow.cpp