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

[Joseph Marrero]

commit 179b414ee7aeefefa0544a959208fed533bb0ef4
Merge: cd6b014 31fdfbd
Author: joseph <joseph at localhost.localdomain>
Date:   Wed Apr 24 10:11:31 2013 -0400

    Merge branch 'master' into f18

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