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

[Joseph Marrero]

commit 8cb6315ee02aed9923334fe225c46fc8f231ab8d
Merge: 86b81b2 31fdfbd
Author: joseph <joseph at localhost.localdomain>
Date:   Wed Apr 24 10:12:49 2013 -0400

    Merge branch 'master' into f17

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