Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Fri, 3 Jun 2016 15:10:07 +0000 (15:10 +0000)
committerrsiddharth <rsd@gnu.org>
Fri, 3 Jun 2016 15:10:07 +0000 (15:10 +0000)
commitf126905b8afbfac76733904be52a82e921aa708d
tree5c718084b4e13fe4e203b04dcbd1151183da63ec
parentddc70035e39b0fb60ebd0b86b8cebffcdcd3fc73
parent02d29961bbabee7b2e84d93011882410d4806c26
Merge branch 'master' into stable