commit 2f2cb30e929a1a1068f470f702fa992c97f8de3a
author Samuel A. Falvo II <sam.falvo@rackspace.com> Fri Dec 13 16:17:41 2013 -0800
committer Samuel A. Falvo II <sam.falvo@rackspace.com> Fri Dec 13 16:17:41 2013 -0800
tree a9720b24e2c30526b748f411e76c95f1307ad46d
parent 9b8695b7a6a0667b20c96cb7899a00f582e150d6
parent 2be65d143a6763d1506cb3d2475dafb720697a5d

Merge branch 'issue-21-list-addresses-by-network' of https://github.com/jrperritt/gophercloud into jrperritt-issue-21-list-addresses-by-network

Conflicts:
	.travis.yml

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index aeeca21..6e1dbd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@
 install:
   - go get -v .
 go:
-  - 1.0
   - 1.1
   - 1.2
   - tip
@@ -11,5 +10,5 @@
   - go get github.com/axw/gocov/gocov
   - go get github.com/mattn/goveralls
   - export PATH=$PATH:$HOME/gopath/bin/
-  - goveralls ywf0TpEcUc19k8FsI6oVSrzdPCkYh2JqI
+  - goveralls 2k7PTU3xa474Hymwgdj6XjqenNfGTNkO8