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

Merge branch 'upstream-unstable'
---

df95876508f6353f4ec11f8528c526f124435e7f