From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 10 Jan 2013 21:24:55 +0000 (+0100)
Subject: Merge branch 'master' into rewrite
X-Git-Tag: 0.1~38
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=6ec36ef950c23c135bf0e112d932c5b7068189b8;hp=6ec36ef950c23c135bf0e112d932c5b7068189b8;p=rhynodge.git

Merge branch 'master' into rewrite

Conflicts:
	src/main/java/net/pterodactylus/rhynodge/filters/KickAssTorrentsFilter.java
---