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

[Filipe Rosset]

commit 31b4017e12d82702849fee7b35f33f166621b82d
Merge: 5d277ad da99ac4
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Mon Mar 23 00:59:48 2015 -0300

    Merge branch 'master' into f20

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