Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Fri, 3 Jun 2016 16:23:27 +0000 (16:23 +0000)
committerrsiddharth <rsd@gnu.org>
Fri, 3 Jun 2016 16:23:27 +0000 (16:23 +0000)
commit814e18eb0e35616a011da71ffb2d0eed0bbaadfc
tree874f1c96550afe6c65496bfe9094636169e2fe78
parentf126905b8afbfac76733904be52a82e921aa708d
parent9cdd62a12c3860644ecc5eec78a3cb19105b096b
Merge branch 'master' into stable