Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:00:01 +0000 (12:00 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:00:01 +0000 (12:00 -0400)
commit0f0d7beb63d20c13040ab0f5eefb837151fd4326
treead476372f1d3ff0784b2de7d9cdbb8deb7488d60
parent0d310874b9f92a2357febb4ff6eb237ba439e81c
parent96959968e7278f912ffb500862a8d772837011e1
Merge branch 'master' into stable