Merge remote-tracking branch 'upstream/master' into 2478

This commit is contained in:
Joona Hoikkala
2016-03-25 16:35:39 +02:00
18 changed files with 940 additions and 785 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ class Plugin(object):
NOTE: if you add argpase arguments such that users setting them can
create a config entry that python's bool() would consider false (ie,
the use might set the variable to "", [], 0, etc), please ensure that
cli._set_by_cli() works for your variable.
cli.set_by_cli() works for your variable.
"""