[vrq/f20: 4/4] Merge branch 'master' into f20

[Filipe Rosset]

commit 04e62dd8f60e942328c05cf1337fe0c67b2d964d
Merge: f2f6779 7a54792
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Mon Aug 25 01:10:12 2014 -0300

    Merge branch 'master' into f20

 .gitignore |    1 +
 sources    |    2 +-
 vrq.spec   |   17 ++++++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)
---