From: Christian Garbs <mitch@cgarbs.de>
Date: Fri, 26 Dec 2008 23:00:07 +0000 (+0100)
Subject: Merge branch 'master' into plugin
X-Git-Url: https://git.camperquake.de/gitweb.cgi?p=xmlrtorrent.git;a=commitdiff_plain;h=dcda5a3b8722768a1dc877284263c693188a9c85

Merge branch 'master' into plugin

Conflicts:

	bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml
---

dcda5a3b8722768a1dc877284263c693188a9c85