From: Yves-Alexis Perez <corsac@debian.org>
Date: Tue, 15 May 2012 21:31:03 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1cba045f8eefa605225f8fac3bc59439389237;p=midori

Merge branch 'upstream-unstable'
---

9b1cba045f8eefa605225f8fac3bc59439389237