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

[Joseph Marrero]

commit eb0dc12514d95dfe954219f0b5303e501c664402
Merge: 0a83880 dcf51ba
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Wed Mar 19 11:40:26 2014 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	mirall.spec

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