Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 15:39:47 +0000 (11:39 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 15:39:47 +0000 (11:39 -0400)
commit0d310874b9f92a2357febb4ff6eb237ba439e81c
treebfd3cefdc6cf636afe7f6f7fbf08f068d6b886cd
parent4e3f36e8833b9f72ffa31424f92ef58e21d94938
parent0f50a5c5e003a5076edf06bef2b1beaa6cb9f5d5
Merge branch 'master' into stable