Merge branch 'develop'

Conflicts: README.md
djcas9 · Jul 7, 2014 · 5451018 · 5451018
2 parents f973263 + b6be4ba
commit 5451018
Show file tree

Hide file tree

Showing 11 changed files with 804 additions and 343 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language: go
 
 go:
-  - 1.1
-  - 1.2
   - 1.3
   - tip