From: Yves-Alexis Perez <corsac@debian.org>
Date: Sun, 13 Nov 2011 19:31:57 +0000 (+0100)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f604ffd3886c54ba2e42342843dd8aa0924fb409;p=midori

Merge branch 'upstream-unstable'
---

f604ffd3886c54ba2e42342843dd8aa0924fb409