chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Mon, 21 Mar 2016 22:01:54 +0000 (22:01 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Mon, 21 Mar 2016 22:01:54 +0000 (22:01 +0000)
commit98809fc38f9c9d115aa0bb2e1e6bb3818bf6ab19
treed86a5e5ce2cd51054824d15180315f928b20fc9b
parenta6d408182261fcf1ca55136324baceefe84b63a8
parent009a926ea47d7f9e5d9173b45a4fe0ceba1582f2
Merge branch 'master' into 'master'

Remove extra blank lines in makebuildserver output

These seem to have appeared during the py3 conversion.

See merge request !114