Merge branch 'master' into 4232-slow-pipes-n-jobs
authorPhil Hodgson <bitbucket@philhodgson.net>
Mon, 26 Jan 2015 15:08:47 +0000 (16:08 +0100)
committerPhil Hodgson <bitbucket@philhodgson.net>
Mon, 26 Jan 2015 15:08:47 +0000 (16:08 +0100)
commitf8af0c6c331d5b52deab50abf7afa8c7881cddfb
tree44feed67a81687e829052ca96298a00f98f7584c
parent2fc8f46b831dab10200eadfc67ccdfd99e0dbc92
parent0dfab8a6e4c9e10361de36a4c34d38e19c690035
Merge branch 'master' into 4232-slow-pipes-n-jobs