Merge branch 'master' into stable
authork054 <k@fsf.org>
Fri, 18 Mar 2016 22:51:24 +0000 (18:51 -0400)
committerk054 <k@fsf.org>
Fri, 18 Mar 2016 22:51:24 +0000 (18:51 -0400)
commita2eef357498bc39f2e36242960028dcbf9d0c489
treee904c0c752a643a10deec4a18df7343e35fea52d
parent29ae50cb3be2bb3981cbe8a5afd6ebfc390c6958
parenta30498e26795139fc6f18c9faf5391a2ae20df20
Merge branch 'master' into stable