[release-notes: 4/5] Merges, merges everywhere

[pbokoc]

commit 5053ba39a5bf1915aafcf8ed2829ca19d62c61bb
Merge: 492b729 bc915d2
Author: Petr Bokoc <pbokoc at redhat.com>
Date:   Thu Oct 16 14:59:24 2014 +0200

    Merges, merges everywhere
    
    Conflicts:
    	en-US/Section-Developers.xml

 en-US/Multimedia.xml         |   27 ++++++++++++++++++++++++++-
 en-US/Section-Desktop.xml    |    3 +--
 en-US/Section-Developers.xml |    2 --
 en-US/Section-Sysadmin.xml   |    5 +----
 4 files changed, 28 insertions(+), 9 deletions(-)
---
diff --cc en-US/Section-Developers.xml
index a8b01aa,432e577..3b14e89
--- a/en-US/Section-Developers.xml
+++ b/en-US/Section-Developers.xml
@@@ -11,11 -11,8 +11,9 @@@
    <xi:include href="Development.xml"
                xmlns:xi="http://www.w3.org/2001/XInclude" />
  
- 
    <xi:include href="Development_Tools.xml"
                xmlns:xi="http://www.w3.org/2001/XInclude"/>
 +
- 
    <xi:include href="Development_GCC_Tools.xml"
                xmlns:xi="http://www.w3.org/2001/XInclude" />