Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Sep 2016 21:49:40 +0000 (17:49 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Sep 2016 21:49:40 +0000 (17:49 -0400)
commitd8c654c111180a1fca81e60df2008bcfcccd9bdf
tree676b4a4f0e6e0e923cc87c8f5b2223d8539a03cf
parentfb4d55e7f8bcea2c3b28a80adfe8a777b14499ed
parente232849b77ce79aa1a7a31269e720258255d1ba8
Merge branch 'master' into stable