From: Yves-Alexis Perez <corsac@debian.org>
Date: Thu, 8 Mar 2012 22:42:46 +0000 (+0100)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf2d83aba2dcd8b8049e916c6ae9fe67712357a6;p=midori

Merge branch 'upstream-unstable'
---

bf2d83aba2dcd8b8049e916c6ae9fe67712357a6