chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Mon, 28 Mar 2016 08:01:00 +0000 (08:01 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Mon, 28 Mar 2016 08:01:00 +0000 (08:01 +0000)
commitb72fa0d5a2de4f54b950d09e187c14e7fe496501
treeae669b22eef85a3c28ab0d98e16d395192f77796
parentf46253a79f2aa5747cccb348511cc4fe91249d90
parent593a94ea7f8ae926ed4b6830b1be8c80a80d9bd1
Merge branch 'master' into 'master'

Fix error in build.py

See merge request !115