chiark / gitweb /
Merge branch 'master' into 'master'
authorDaniel Martí <mvdan@mvdan.cc>
Fri, 12 Feb 2016 09:13:53 +0000 (09:13 +0000)
committerDaniel Martí <mvdan@mvdan.cc>
Fri, 12 Feb 2016 09:13:53 +0000 (09:13 +0000)
commitc2270f843403cf3b409a55b57f3fd6e004aaac8d
treed21bf7798c7461fbe3c0d962965083262dc2f728
parent7feeaad095c192eda4f256ecf9beb6432da385d8
parent5780c14df281f12089214358c7e52acc51d2b248
Merge branch 'master' into 'master'

a couple fixes

these are three fixes, one related to my previous merge request, as discussed with @mvdan in IRC

See merge request !99