Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Fri, 20 Feb 2015 20:10:02 +0000 (15:10 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Fri, 20 Feb 2015 20:10:02 +0000 (15:10 -0500)
commitf030025f6774de6a07a22ba3313c6c797e0b7474
tree081aaccc24f9580299731ee0cbab3a5067989c84
parent205a3f98e2b4529d7bb9fa420cd9754aed0091b6
parentf3c0ef0987851f6bd03eae5e081dedad08fffd20
Merge branch 'master' into stable