chiark / gitweb /
Merge branch 'makebs-updates' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Thu, 15 Sep 2016 20:38:43 +0000 (20:38 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Thu, 15 Sep 2016 20:38:43 +0000 (20:38 +0000)
commit8fc27680cb913340a6b2fc3abec202920ebfecb9
treeaf65fbe0631ded9eee91204e364d87f05841485f
parent071376b7f4c9b30ca1d3e7ff7d7f670a3c7afaf1
parent8797cc01a8113c69a8d51acbac97b0c728d9c1ee
Merge branch 'makebs-updates' into 'master'

Makebs updates

See merge request !167