Merge branch 'next' into new-database-38 new-database-38
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 12 Jan 2013 16:41:27 +0000 (17:41 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 14 Jan 2013 05:32:50 +0000 (06:32 +0100)
commit771e8efcd92c7325423441d57c5a6ed90a835e6f
treebc55e10667be7d810c1cba0582577146c42b7a30
parent927de326e0af0f11a27b3444f4e25b0796c877db
parent66b03d16a393c9f02090245ea963d45ce0b4cf79
Merge branch 'next' into new-database-38

Conflicts:
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/web/SearchPage.java
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
src/main/java/net/pterodactylus/sone/web/SearchPage.java
src/main/java/net/pterodactylus/sone/web/WebInterface.java
src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java