Merge remote-tracking branch 'origin/master' into iss21-embedded-structs

Sam Woodard · Sam Woodard · commit 9829120906ff · 2016-04-10T05:08:24.000-07:00
* origin/master:
  update travis build versions
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: go
 go:
-  - 1.4
-  - 1.5.1
+  - 1.4.3
+  - 1.5.3
+  - 1.6
   - tip
 script: go test -v .

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 language: go
 go:
 -  - 1.4
 -  - 1.5.1
 +  - 1.4.3
 +  - 1.5.3
 +  - 1.6
   - tip
 script: go test -v .