Merge branch 'next' into new-database-38
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Sep 2012 12:34:58 +0000 (14:34 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 13 Sep 2012 14:19:41 +0000 (16:19 +0200)
commit927de326e0af0f11a27b3444f4e25b0796c877db
tree0e08b14dcf4ba2a1ee0aeb9231726c73c773a62f
parentc1fd1bc55bd809fd4ee447b2679bb8aafe4e06fc
parentbdbd75eb4ef763f7d821e4e5c49b48eac0564cc4
Merge branch 'next' into new-database-38

Conflicts:
src/main/java/net/pterodactylus/sone/core/Core.java
src/main/java/net/pterodactylus/sone/data/Sone.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/core/Core.java
src/main/java/net/pterodactylus/sone/database/memory/MemorySone.java
src/main/java/net/pterodactylus/sone/main/SonePlugin.java
src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java
src/main/java/net/pterodactylus/sone/template/SoneAccessor.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/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java
src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java