From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 26 Jan 2013 11:35:09 +0000 (+0100)
Subject: Merge branch 'partial-rewrite' into less-critical
X-Git-Tag: 0.8.5^2~3^2~45
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;hp=8f02544d31f323ae9053dd9a11a99eacd8cf5bcd;p=Sone.git

Merge branch 'partial-rewrite' into less-critical

Conflicts:
	src/main/java/net/pterodactylus/sone/data/impl/DefaultPostBuilderFactory.java
	src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
---