From 4f577981b3605cb54985e0edc8eee972ecc84a34 Mon Sep 17 00:00:00 2001
From: Vishal Rana <vr@labstack.com>
Date: Fri, 29 Jan 2016 09:16:05 -0800
Subject: [PATCH] Dropped Go 1.4

Signed-off-by: Vishal Rana <vr@labstack.com>
---
 .travis.yml | 2 +-
 echo.go     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 084ec7918..15ff4dc93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-    - 1.4
+    - 1.5
     - tip
 before_install:
     - go get github.com/modocache/gover
diff --git a/echo.go b/echo.go
index 0e05859c9..ce0581c07 100644
--- a/echo.go
+++ b/echo.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"path"
 	"path/filepath"
 	"reflect"
 	"runtime"
@@ -423,7 +424,7 @@ func (e *Echo) serveFile(dir, file string, c Context) (err error) {
 		d := f
 
 		// Index file
-		file = filepath.Join(file, indexPage)
+		file = path.Join(file, indexPage)
 		f, err = fs.Open(file)
 		if err != nil {
 			if e.autoIndex {