Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:20:13 +0000 (12:20 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:20:13 +0000 (12:20 -0400)
commita088f91ec81a9e2e96ea89b4563bddac49815753
treeff96875aff17d3c858e71ae683c5d024b357b3b6
parent0f0d7beb63d20c13040ab0f5eefb837151fd4326
parenta998b9386d784afd8cdfcc58b714b524bc56f004
Merge branch 'master' into stable