Merge branch 'master' into stable
authork054 <k@fsf.org>
Fri, 18 Mar 2016 23:02:49 +0000 (19:02 -0400)
committerk054 <k@fsf.org>
Fri, 18 Mar 2016 23:02:49 +0000 (19:02 -0400)
commite57623f6f1868b2d5356f745983ddf177507a1d4
treec69dc948ded428a1e6b50ef6da8a949213598aca
parenta2eef357498bc39f2e36242960028dcbf9d0c489
parent2794b2fc978c9a0253de863899386b318b51881a
Merge branch 'master' into stable