[linsmith/f19: 6/6] Merge branch 'master' into f19

[Filipe Rosset]

commit 067d7e4f5692e81d10ac34ad0189f29388137a8a
Merge: 5b536ce d897437
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Sun Aug 31 00:03:21 2014 -0300

    Merge branch 'master' into f19

 .gitignore    |    2 ++
 linsmith.spec |   28 +++++++++++++++++-----------
 sources       |    2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)
---