chiark / gitweb /
Merge branch 'master' into 'master'
authorCiaran Gultnieks <ciaran@ciarang.com>
Wed, 21 Jan 2015 16:30:43 +0000 (16:30 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Wed, 21 Jan 2015 16:30:43 +0000 (16:30 +0000)
commit7fdddb729e2a364d0c76f8582a6e8e4c4b83eeb1
treee76cb6433c8e27681d5c53e6bb394850b27ec370
parent2656ea230cd04bcba96cdbcde41b6320e4f856d5
parent2a87ae51278f590453cbab6adc15db79bfd1dc97
Merge branch 'master' into 'master'

fix build issues

Fixed three build issues: one PEP8 and two small errors in the tests.

See merge request !39