Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 19:49:34 +0000 (15:49 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 14 Mar 2016 19:49:34 +0000 (15:49 -0400)
commit327cbedd4e7e2535a795a1f47872243f2a117a6c
tree982c622caf3cdcfce704a0f187a379635ccd7b1f
parent4413678455ddaa8b6c87be6368a5c86e37608240
parentd00a22d587365ac0b4ee7e4d65f036e785c86f7b
Merge branch 'master' into stable