[release-notes: 2/2] Safe merge

[John J. McDonough]

commit b5565e8fefda5e62a0a3512918fc6862b38236cc
Merge: 681881f 24e874e
Author: John J. McDonough <jjmcd at fedoraproject.org>
Date:   Sat Oct 19 16:39:46 2013 -0400

    Safe merge

 en-US/Desktop.xml        |   12 +++++++-
 en-US/Printing.xml       |   58 +++++++++++++++++++++++++++++++---------
 en-US/Security.xml       |   22 ---------------
 en-US/Virtualization.xml |   66 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 120 insertions(+), 38 deletions(-)
---