Merge branch 'master' into stable
authorZak Rogoff <zak@fsf.org>
Tue, 15 Mar 2016 14:53:41 +0000 (10:53 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 15 Mar 2016 14:53:41 +0000 (10:53 -0400)
commitb999e3a266e45e2aa7a5ec0ee82fa4f651f690ef
treedc289f3c8aff1e75f2d9a78a99031eb17cd80b78
parent327cbedd4e7e2535a795a1f47872243f2a117a6c
parent4653961df97753905d442dccdab66bf92e241261
Merge branch 'master' into stable