merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 03 May 2016 10:41:17 -0500
changeset 29054 acc4c6070f31
parent 28976 9fb2e8c8f320 (diff)
parent 29053 61463b8fcef8 (current diff)
child 29055 4a65c9c6cd3f
merge with stable
contrib/docker/ubuntu-trusty