From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 17 Feb 2011 10:30:19 +0000 (+0100)
Subject: Merge branch 'bookmarks' into next. This fixes #103.
X-Git-Tag: 0.4.4^2~7
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=6e98888ca9440b004c7d65786ea47c4f263de7b2

Merge branch 'bookmarks' into next. This fixes #103.
---

6e98888ca9440b004c7d65786ea47c4f263de7b2