Merge branch 'master' into stable
authork054 <k@fsf.org>
Sat, 19 Mar 2016 12:53:11 +0000 (08:53 -0400)
committerk054 <k@fsf.org>
Sat, 19 Mar 2016 12:53:11 +0000 (08:53 -0400)
commitfd7124143790cfcf6d7a0abdd91b28e808fdf3c0
tree05c0756edead63ca69d7f762f219703e2b024def
parent49ed72bd116285571b77321f94ee81fff2fa9af4
parent332d05eb036d82bb20a80a8541c621be8e1d6c13
Merge branch 'master' into stable