Merge branch 'master' into stable
authorrsiddharth <rsd@gnu.org>
Wed, 29 Oct 2014 13:14:33 +0000 (09:14 -0400)
committerrsiddharth <rsd@gnu.org>
Wed, 29 Oct 2014 13:14:33 +0000 (09:14 -0400)
commit9fef225e42d95897cfb218c301ca2c2769e5df65
tree9c251bccb38eb00626518c6c4df9f95b2139579a
parentacc364b099189a332031915f99cc2286f0073c9d
parent16ecd3cc0ff770031c4ce671ac2aae0d605a614d
Merge branch 'master' into stable