From: Ryan Niebur <ryanryan52@gmail.com>
Date: Fri, 29 May 2009 06:14:55 +0000 (-0700)
Subject: Merge commit 'upstream/0.1.7'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96c6e3008d4d653dd8e0e9a1a73f593463796d33;p=midori

Merge commit 'upstream/0.1.7'
---

96c6e3008d4d653dd8e0e9a1a73f593463796d33