From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 25 Nov 2011 06:50:06 +0000 (+0100)
Subject: Merge branch 'notifications' into next
X-Git-Tag: 0.7.5^2~4
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=8b576ec955d0c3a7d6e57326438b532afe40aa0f;hp=cf58e5c2605f469be3f1b564bee1386f096495c5

Merge branch 'notifications' into next

This resolves #254.
---