Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 16:59:33 +0000 (12:59 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 16:59:33 +0000 (12:59 -0400)
commit69a920636b319db3b12de9b4d9500e2df62dc77b
tree9b1bf241da5a8299dee7952d97f954c45b8c6a0e
parentb11cba0f31081ac1e74684ea4669f12a5b5fa781
parent2455fa06aef3d2164f733f7c106bedadd2881e05
Merge branch 'master' into stable