Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Fri, 29 Jan 2016 21:29:43 +0000 (16:29 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 29 Jan 2016 21:29:43 +0000 (16:29 -0500)
commitca00f7da23935fb5b4cf34db5c57fa54d66ed8a6
tree4c5debce5de741282429302d37ff5674631c0ec3
parent8997b6a5576931628bc8c52f3a37a2f026e63081
parent35bd463e06881f0f6b2091a63582dbd1cf793459
Merge branch 'master' into stable