[feh/f13/master] (4 commits) ...Merge branch 'master' into f13

[Ignacio Vazquez-Abrams]

Summary of changes:

  f380a9d... dist-git conversion (*)
  d00b940... Update from BZ#666312 (*)
  f7614ba... Add libXinerama-devel to BR (*)
  b0eb86b... Merge branch 'master' into f13

(*) This commit already existed in another branch; no separate mail sent