Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:58:54 +0000 (12:58 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 16 Sep 2014 16:58:54 +0000 (12:58 -0400)
commit6551985e3228e84297231c17ac1344e2509e1c59
tree8acdcdcf749f64ff7b72e20172e0f8f2afa0730e
parentff38657dc8d7d2089de8674419fe7b463a56c315
parent9eb4363c33094b924c7044cf5a098db5618d0919
Merge branch 'master' into stable