tree 25bf7f2a910286055f8438c6c39459de466329dc
parent ea879bedf1557340fed05206a3e02278acbf4864
parent 9125de0d9684ac5696cd9adc603ab6f8769612ec
author Jenkins <jenkins@review.openstack.org> 1382459979 +0000
committer Gerrit Code Review <review@openstack.org> 1382459979 +0000

Merge "Change six to match global requirements"