Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Sat, 12 Nov 2016 19:12:38 +0000 (19:12 +0000)
committerrsiddharth <rsd@gnu.org>
Sat, 12 Nov 2016 19:12:38 +0000 (19:12 +0000)
commitc7a20ec2e8ef4c63d5596ba8cb0ac8e81319e007
treed0c6fa096f5cee27e65b362efd61c223988a0349
parent7554a198bf3560517ca84bc6f25ed4a09bc52b15
parenteda662ec4577bb39e3b21ff84f62b9a95c438b7b
Merge branch 'master' into stable