Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Fri, 7 Oct 2016 05:31:40 +0000 (05:31 +0000)
committerrsiddharth <rsd@gnu.org>
Fri, 7 Oct 2016 05:31:40 +0000 (05:31 +0000)
commitadb07a5d94fd3f0af297ad40c0af2694f22f4ee4
treedf167083a8b6c791382bdddd0b9ec1cf11e70f6f
parentdc24e5d910ffb29dc026b2b0fcd22bbb33c4f515
parentfe0ce219fbca5f158b9b391655bc3b3884a3a9c9
Merge branch 'master' into stable