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

[Joseph Marrero]

commit e0dd5fb8a8a2e1dafdef9310f0b3e708d7375f8b
Merge: 8cb6315 899ba33
Author: jmarrero <jmarrero at fedoraproject.org>
Date:   Wed Jun 26 11:54:48 2013 -0400

    Merge branch 'master' into f17

 .gitignore  |    1 +
 mirall.spec |   46 +++++++++++++++-------------------------------
 sources     |    2 +-
 3 files changed, 17 insertions(+), 32 deletions(-)
---