[sword/el6: 23/23] Merge branch 'master' into el6

[Matej Cepl]

commit 0430a2eddc5a817c04f47004e1a638eee66c322d
Merge: bd0d3e9 7b965a7
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Jul 26 20:30:57 2014 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	sword.spec

 sources    |    2 +-
 sword.spec |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 12 deletions(-)
---