Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 16:06:32 +0000 (11:06 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 16:06:32 +0000 (11:06 -0500)
commit542d3f03bc2fdb4186efe4f95978f9ed42e3ed0f
tree1bf1a5ab25c6810a291b912d18e49278e145d438
parent803f0c172f0e246992b8d38f6be48b0cd16136d1
parent89da48e83858f3eee1fd5f46cefb967eca560d50
Merge branch 'master' into stable