Merge branch '2.1.x' into devel

This commit is contained in:
Martin Konecny 2012-08-02 18:10:12 -04:00
commit 194b4ec36e
1 changed files with 1 additions and 0 deletions

View File

@ -86,6 +86,7 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
fallible = true,
url = url,
description = description,
name = description,
genre = genre,
user = !user_ref,
on_error = on_error,