Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Thu, 28 Jan 2016 23:01:49 +0000 (18:01 -0500)
committerZak Rogoff <zak@fsf.org>
Thu, 28 Jan 2016 23:01:49 +0000 (18:01 -0500)
commit8997b6a5576931628bc8c52f3a37a2f026e63081
treefc2ada30a3a52f3bd512dd44e4471ccd010846f0
parent39454d2f197b290c20f6f71172adde409c0dec0d
parent47c0a0ab5a7a7fbebe545e8ec37cf1a7adb750ec
Merge branch 'master' into stable