Merge branch 'master' into stable
authork054 <k@fsf.org>
Sat, 19 Mar 2016 12:12:38 +0000 (08:12 -0400)
committerk054 <k@fsf.org>
Sat, 19 Mar 2016 12:12:38 +0000 (08:12 -0400)
commit49ed72bd116285571b77321f94ee81fff2fa9af4
treec909333ef39ca403ad7102b8c7d086f30175b3fd
parent260f7352650bc4741fc54116f57b49a593a53318
parent1cd6fa1ae081838cb5ca67f8e213453f4cb554cb
Merge branch 'master' into stable