Merge branch 'master' into stable
authork054 <k@fsf.org>
Sat, 19 Mar 2016 11:54:27 +0000 (07:54 -0400)
committerk054 <k@fsf.org>
Sat, 19 Mar 2016 11:54:27 +0000 (07:54 -0400)
commit260f7352650bc4741fc54116f57b49a593a53318
tree9906c8fde564f954f6e4d80c935d7b6afbcddc86
parent3fbe643f388adc3cde7f38ea3425441ea2ce8bf3
parent805248b4cd3e5c4004d2c4c88450fab748869ecf
Merge branch 'master' into stable