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

Merge branch 'upstream-unstable'
---

23af38a149de7818416678a1d317cd347b41d684