Merge branch 'master' into stable
authorZak Rogoff <zak@montage.office.fsf.org>
Mon, 23 Feb 2015 22:52:09 +0000 (17:52 -0500)
committerZak Rogoff <zak@montage.office.fsf.org>
Mon, 23 Feb 2015 22:52:09 +0000 (17:52 -0500)
commitdc667d5852dcc204a5d996d6298bb3e023cc656c
tree614b91d9a8f23513974265d99bc9974bd2a7e3e9
parentf030025f6774de6a07a22ba3313c6c797e0b7474
parentb7ccedf75cd7793ba6e2d5c91831d9211ac4c1a9
Merge branch 'master' into stable