chiark / gitweb /
Merge branch 'master' into 'master'
authorCiaran Gultnieks <ciaran@ciarang.com>
Thu, 3 Apr 2014 16:51:15 +0000 (16:51 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Thu, 3 Apr 2014 16:51:15 +0000 (16:51 +0000)
commit9ccdd209acfbcf51bb633ddff7304431c8e0bc17
tree549abefe44c6c1038b875dd21f0ca131ae4298e5
parentc353a69231ee7f2ca68ccfbd482f2b974a3355eb
parent947a6d57d25dd4418f871b8b60330140b7c4f0d9
 Merge branch 'master' into 'master'

build and test fixes

various fixes for the build process and tests