Merge branch 'btor'
authorClifford Wolf <clifford@clifford.at>
Fri, 24 Jan 2014 22:44:46 +0000 (23:44 +0100)
committerClifford Wolf <clifford@clifford.at>
Fri, 24 Jan 2014 22:44:46 +0000 (23:44 +0100)
commita139b4940115ac288ac39d81ce9e089bd52bb2f0
tree349fcea30afd97850cd734e2202fc16f9e69323e
parent0b47d907d36842e0971dd038b5fb6093ca303a8a
parent137742786e0409a43f9d69177f2929d9226dad8e
Merge branch 'btor'