Merge pull request #869 from anandolee/master

fix json_format for python2.6:

1 files changed, 1 insertions, 2 deletions

diff --git a/travis.sh b/travis.sh
index 6b050737..435e7e75 100755
--- a/travis.sh
+++ b/travis.sh
@@ -131,8 +131,7 @@ build_python() {
   cd python
   # Only test Python 2.6/3.x on Linux
   if [ $(uname -s) == "Linux" ]; then
-    # py26 is currently disabled due to json_format
-    envlist=py\{27,33,34\}-python
+    envlist=py\{26,27,33,34\}-python
   else
     envlist=py27-python
   fi