Merging from master/v1

2016-05-22 18:30:07 -04:00
parent b35c8a92d2
commit 6d6f7da978
9 changed files with 65 additions and 53 deletions
--- a/altsrc/map_input_source.go
+++ b/altsrc/map_input_source.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"

-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 )

 // MapInputSource implements InputSourceContext to return