From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 16 May 2011 06:06:33 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5f7a13c1cf9c58e5cadd4bb54b625fbd051fd65;p=midori

Merge branch 'upstream-unstable'
---

c5f7a13c1cf9c58e5cadd4bb54b625fbd051fd65