Merge branch 'master' into martin-t/dmgtext2
authorterencehill <piuntn@gmail.com>
Fri, 16 Jun 2017 21:22:31 +0000 (23:22 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Jun 2017 21:22:31 +0000 (23:22 +0200)
commit3e429efe7622f7ea5c504f2dd5e9e2cd0f91c8cc
tree88e6ca57bb0ffd2e42fe35d77ad897677d46b55a
parent63841ddfb9349787f6380b9e9e2606e6d7ed9eb6
parent7718f96c4300cfe595e4e4706bf1bdcbdf414177
Merge branch 'master' into martin-t/dmgtext2