Merge branch 'master' into plugin

Conflicts:

	bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml

diff --git a/bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml b/bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml
index 4c00504..82d765a 100644 (file)
--- a/bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml
+++ b/bugs/issue-fa406e503dacdd866dfa5b4e8d2a60b4bdebaaeb.yaml
@@ -5,8 +5,8 @@ type: :feature
 component: xmlrtorrent
 release: 
 reporter: Christian Garbs <mitch@cgarbs.de>
-status: :unstarted
-disposition: 
+status: :closed
+disposition: :fixed
 creation_time: 2008-12-10 21:44:30.878686 Z
 references: []
 
@@ -16,3 +16,7 @@ log_events:
   - Christian Garbs <mitch@cgarbs.de>
   - created
   - ""
+- - 2008-12-26 20:34:31.185555 Z
+  - Christian Garbs <mitch@cgarbs.de>
+  - closed with disposition fixed
+  - HTTP Authentication has been added on 20/12/2008