From: Yves-Alexis Perez <corsac@debian.org>
Date: Thu, 20 Sep 2012 05:36:31 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fae7cfdb3dd11309a0da43fc1d18f4e98d26c288;p=midori

Merge branch 'upstream-unstable'
---

fae7cfdb3dd11309a0da43fc1d18f4e98d26c288