[vdpauinfo/el6: 11/11] Merge branch 'master' into el6

[Nicolas Chauvet]

commit 2eae6d055ddf8ad14d29f51bffb4d6d9566fb656
Merge: 19a2d71 3f19589
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sat Dec 20 10:22:26 2014 +0100

    Merge branch 'master' into el6

 .gitignore     |    2 ++
 sources        |    2 +-
 vdpauinfo.spec |   43 ++++++++++++++++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 12 deletions(-)
---