Merge branch 'configurable-notifications-250' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 11 Nov 2011 12:24:57 +0000 (13:24 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 11 Nov 2011 12:26:04 +0000 (13:26 +0100)
commit1dfe9f0daba9a1103c5566b81af5bed7791dde5c
tree141dbc968abd2718e8bafb9b24d9c749e30220de
parent1e79a3900f383fae900d3027de3c45bf1853ff15
parent8f1c9d1ff4724502b3c93545a6a1f0cd9e5e30e2
Merge branch 'configurable-notifications-250' into next

This resolves #250.

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