From: Yves-Alexis Perez <corsac@debian.org>
Date: Tue, 2 Aug 2011 05:43:10 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=459dd9dffe6933e9a0cbf5d1955803bf2fd2cfa6;p=midori

Merge branch 'upstream-unstable'
---

459dd9dffe6933e9a0cbf5d1955803bf2fd2cfa6