Merge branch 'master' of git.kde.org:rekonq
authorAndrea Diamantini <adjam7@gmail.com>
Sun, 7 Nov 2010 21:33:11 +0000 (22:33 +0100)
committerAndrea Diamantini <adjam7@gmail.com>
Sun, 7 Nov 2010 21:33:11 +0000 (22:33 +0100)
commit4bb3ca9452cb165d8ca8da5e3fc5bcfe1b9cfd1a
tree151d078b89a94ea10142c0979db8306119ad6865
parent23fdf29c98c402e96e7cb14eecba30671bc72d64
parentf55423c33944002c16a57c05d5be520c465ed4cc
Merge branch 'master' of git.kde.org:rekonq