Merge branch 'fcp-interface' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 11 May 2011 04:12:43 +0000 (06:12 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 11 May 2011 04:12:43 +0000 (06:12 +0200)
commitaa94dcb712392b69cb431d1637e4948688d15791
tree69030ed4d29443ab9acd00866b4ef05e3f4d4ee7
parent89f4300557674bdc63bd83f77fc7cdb6171b83f5
parent2fef2b7dae1fb428e1b060b740b253189dc22bf7
Merge branch 'fcp-interface' into next

This fixes #21.
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
src/main/java/net/pterodactylus/sone/web/OptionsPage.java
src/main/resources/i18n/sone.en.properties
src/main/resources/templates/options.html