Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Mon, 26 Oct 2015 15:55:06 +0000 (11:55 -0400)
committerrsiddharth <rsd@gnu.org>
Mon, 26 Oct 2015 15:55:06 +0000 (11:55 -0400)
commite9b05858226ab2cb4a54ce59718035605840fbfc
tree48b3c340b14d3dcaef328d0918c9fb145baf5e43
parent6e92b04f7a07d24538352d4e1d2225b805580ff5
parentec050596ed4075fabbb9bd7b64a89425db2aa2cf
Merge branch 'master' into stable