Merge branch 'master' into rewrite
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 10 Jan 2013 21:24:55 +0000 (22:24 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 11 Jan 2013 06:19:37 +0000 (07:19 +0100)
commit6ec36ef950c23c135bf0e112d932c5b7068189b8
treeb1830b2c41110b4019e5f3b851194a6892527ec2
parenteee108815d981f253877848e1fa60952219e5bff
parent2989702742c219f12f11be3bc57c96798364d971
Merge branch 'master' into rewrite

Conflicts:
src/main/java/net/pterodactylus/rhynodge/filters/KickAssTorrentsFilter.java
src/main/java/net/pterodactylus/rhynodge/filters/KickAssTorrentsFilter.java
src/main/java/net/pterodactylus/rhynodge/filters/PirateBayFilter.java
src/main/java/net/pterodactylus/rhynodge/filters/TorrentSiteFilter.java
src/main/java/net/pterodactylus/rhynodge/states/TorrentState.java
src/main/java/net/pterodactylus/rhynodge/triggers/NewEpisodeTrigger.java
src/main/java/net/pterodactylus/rhynodge/triggers/NewTorrentTrigger.java
src/main/resources/chains/thepiratebay-example.json