[mirall/f19: 2/2] Merge branch 'master' into f19

[Joseph Marrero]

commit 2bb8d4ef8e649d9fdb4c9bd2829ca98c355c64cc
Merge: c3759cb 989b843
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Mon May 5 22:48:22 2014 -0400

    Merge branch 'master' into f19

 .gitignore  |    1 +
 mirall.spec |    8 +++++---
 sources     |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---