Sync master into develop

- Add 265faff4ba - Update "github.com/julienschmidt/httprouter" version in Godeps - Add 28b9ff9e34
2015-02-04 12:37:22 +01:00
parent 2d1291329a
commit d936320e0e
3 changed files with 26 additions and 4 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@ -4,7 +4,7 @@
 	"Deps": [
 		{
 			"ImportPath": "github.com/julienschmidt/httprouter",
-			"Rev": "90d58bada7e6154006f2728ee09053271154a8f6"
+			"Rev": "aeec11926f7a8fab580383810e1b1bbba99bdaa7"
 		}
 	]
 }