Merge branch 'master' into stable
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Mon, 9 Mar 2015 14:27:50 +0000 (10:27 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Mon, 9 Mar 2015 14:27:50 +0000 (10:27 -0400)
commit257d99643bb43f37386a010ed6ca56b10b308c1e
treeab75ae9a82b11b31177ab3758248fc7e74aa87cb
parent925fc1676ca17c6de1dd4e8af867e27d1fef46a6
parent19be88fc15e4a1ce5fd94f0407f2383dcebe27bd
Merge branch 'master' into stable