Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 28 Jan 2015 22:53:42 +0000 (17:53 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 28 Jan 2015 22:53:42 +0000 (17:53 -0500)
commit36fcf0934a8bec4b96b83c9f36f48f603ede21f8
treee64e3fef75c00f72c49df889aee3e53b23b72bfb
parentc7463afad76162a3955dc885e6a1b4962ca4d8e7
parentbbbac3d089284c8ad0ea40b946407c16341de3b6
Merge branch 'master' into stable