Merge branch 'release/v1.5.1'

ChrisHines · ChrisHines · commit 7b9f5f8ad795 · 2016-05-13T21:09:27.000-04:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![GoDoc](https://godoc.org/github.com/go-stack/stack?status.svg)](https://godoc.org/github.com/go-stack/stack) [![Go Report Card](https://goreportcard.com/badge/go-stack/stack)](https://goreportcard.com/report/go-stack/stack)
+[![GoDoc](https://godoc.org/github.com/go-stack/stack?status.svg)](https://godoc.org/github.com/go-stack/stack) [![Go Report Card](https://goreportcard.com/badge/go-stack/stack)](https://goreportcard.com/report/go-stack/stack) [![TravisCI](https://travis-ci.org/go-stack/stack.svg?branch=master)](https://travis-ci.org/go-stack/stack)
 
 # stack
 
diff --git a/stackinternal_test.go b/stackinternal_test.go
@@ -55,7 +55,7 @@ func TestTrace(t *testing.T) {
 
 	cs := fh.labyrinth()
 
-	lines := []int{50, 41, 55}
+	lines := []int{51, 41, 56}
 
 	for i, line := range lines {
 		if got, want := cs[i].line(), line; got != want {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![GoDoc](https://godoc.org/github.com/go-stack/stack?status.svg)](https://godoc.org/github.com/go-stack/stack) [![Go Report Card](https://goreportcard.com/badge/go-stack/stack)](https://goreportcard.com/report/go-stack/stack)`
	`1`	`+[![GoDoc](https://godoc.org/github.com/go-stack/stack?status.svg)](https://godoc.org/github.com/go-stack/stack) [![Go Report Card](https://goreportcard.com/badge/go-stack/stack)](https://goreportcard.com/report/go-stack/stack) [![TravisCI](https://travis-ci.org/go-stack/stack.svg?branch=master)](https://travis-ci.org/go-stack/stack)`
`2`	`2`
`3`	`3`	`# stack`
`4`	`4`