From: Yves-Alexis Perez <corsac@debian.org>
Date: Sat, 14 Apr 2012 21:53:10 +0000 (+0200)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a489245d134d81d9d1e4aff7068f4f19b6007e07;p=midori

Merge branch 'upstream-unstable'
---

a489245d134d81d9d1e4aff7068f4f19b6007e07