[mirall/f18: 9/9] Merge branch 'master' into f18

[Joseph Marrero]

commit 18034182e99f948e982997a64a61c984a3c765b8
Merge: 430cfb8 b770fcf
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Tue Mar 5 22:02:14 2013 -0400

    Merge branch 'master' into f18

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