Merge branch 'master' into btor-ng
authorClifford Wolf <clifford@clifford.at>
Thu, 23 Nov 2017 08:00:22 +0000 (09:00 +0100)
committerClifford Wolf <clifford@clifford.at>
Thu, 23 Nov 2017 08:00:22 +0000 (09:00 +0100)

Trivial merge