Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 29 Oct 2014 21:02:11 +0000 (17:02 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Wed, 29 Oct 2014 21:02:11 +0000 (17:02 -0400)
commitd9095fb63f9697829c9522be464e842ee7f61005
treeb4cdc56613109b156ae156f4745142bdf0eee45e
parent9fef225e42d95897cfb218c301ca2c2769e5df65
parent60678eee3396ebf3f5c19f4217a638e71045c698
Merge branch 'master' into stable