From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 11 Nov 2011 12:24:57 +0000 (+0100)
Subject: Merge branch 'configurable-notifications-250' into next
X-Git-Tag: 0.7.3^2~14
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=1dfe9f0daba9a1103c5566b81af5bed7791dde5c;hp=1dfe9f0daba9a1103c5566b81af5bed7791dde5c;p=Sone.git

Merge branch 'configurable-notifications-250' into next

This resolves #250.

Conflicts:
	src/main/java/net/pterodactylus/sone/core/Core.java
---