[qsstv/el6: 2/2] Merge branch 'master' into el6

[Richard Shaw]

commit f37d07802148ae1f59df817d54583d3c2cabbfd8
Merge: a1220db 3189c4b
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 23 09:26:18 2015 -0500

    Merge branch 'master' into el6

 .gitignore | 1 +
 qsstv.spec | 6 +++++-
 sources    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---