Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:25:03 +0000 (12:25 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:25:03 +0000 (12:25 -0400)
commitff38657dc8d7d2089de8674419fe7b463a56c315
tree424df5547d9e1a81736c8fe68eead14fae4d53d3
parenta088f91ec81a9e2e96ea89b4563bddac49815753
parent8fc4fecff80b7177a880e1e4fa7c8ad8f52d2480
Merge branch 'master' into stable