[release-notes/prerelease: 9/9] Merge branch 'master' into prerelease

[Pete Travis]

commit 8b405b55c31054c85ba3d8d8303d421d980a7163
Merge: 7b53c09 6e8cfc3
Author: Pete Travis <immanetize at fedoraproject.org>
Date:   Sat Oct 4 12:13:32 2014 -0600

    Merge branch 'master' into prerelease
    
    This should be where the content for rawhide/branched RNs lives.

 build/fedora-release-notes.desktop |    7 +++++--
 en-US/Article_Info.xml             |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---