[xiphos/f20: 16/16] Merge branch 'master' into f20

[Greg Hellings]

commit 053df2342220d7187db4361e1440b729fc2bea38
Merge: 0e7a4c6 1b09117
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Mon Aug 25 22:47:59 2014 -0500

    Merge branch 'master' into f20
    
    Conflicts:
    	xiphos.spec

 .gitignore           |    3 +
 format-warning.patch |   24 +++++++++
 sources              |    2 +-
 xiphos.spec          |  129 ++++++++++++++++++++++++++++++++------------------
 4 files changed, 110 insertions(+), 48 deletions(-)
---