Merge branch 'master' of gitorious.org:rekonq/mainline
authorAndrea Diamantini <adjam7@gmail.com>
Mon, 24 May 2010 08:50:52 +0000 (10:50 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Mon, 24 May 2010 08:50:52 +0000 (10:50 +0200)
commitdabc35315078dd974aec0e0f8204388d765b5bce
treec1501b23fde09af6d125a0693aa74f0124e339a7
parent370d5677ba15c4e41ba2513bbeed266fe69cbe41
parentf0cdea791a657587737654a5dfd9dcc6e07eb3b4
Merge branch 'master' of gitorious.org:rekonq/mainline