Merge branch 'm220'
author Andrea Diamantini
()
committer Andrea Diamantini
()
commit 0862a4df3a9f33bff215adba34676bd88f5d8b00
tree da88bf41e5fcceb28c9f2c94cb32853f767187d9
parent be35eab323d0bc462babe7e815ed3eed74957e7c
parent fd29191d4d6b91358f3188c9aba16183bcda1536
Merge branch 'm220'
src/urlbar/listitem.cpp
src/urlbar/urlresolver.cpp