Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 20:34:33 +0000 (16:34 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 20:34:33 +0000 (16:34 -0400)
commit2d92dfac6d906468da5f24851b5df6d6058d2477
tree77af86199a36193f5c1089b189d7bd8253ea5515
parent69a920636b319db3b12de9b4d9500e2df62dc77b
parentcf0d544e978ed67124b5fdde38626284f9e94617
Merge branch 'master' into stable