Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Fri, 13 Feb 2015 20:15:55 +0000 (15:15 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Fri, 13 Feb 2015 20:15:55 +0000 (15:15 -0500)
commit2715a8775ce1ac94b969a8bc6f65347287215589
tree6259bc9969a5737d9572c41ac8385f2f24a7277b
parent685801bf89a1665442881c8ab92a4fc222a8d8b9
parent8adbf53f0ff46dba232f50e11f091e1ecfb9c39c
Merge branch 'master' into stable