[xiphos/el6: 40/40] Merge branch 'master' into el6

[Matej Cepl]

commit 1783410f7abe0eaf72c61ca30157110338d9578d
Merge: cd9b45d d22471c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Jul 26 21:06:52 2014 +0200

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

 format-warning.patch |   24 +++++++++++++
 sources              |    2 +-
 xiphos.spec          |   94 ++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 101 insertions(+), 19 deletions(-)
---