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

[Joseph Marrero]

commit 7a39428e6319ee59a62c63a00565d6ef4c0790bc
Merge: 123c63c e9f9b02
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Wed Sep 4 12:30:26 2013 -0400

    Merge branch 'master' into f19

 mirall.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---