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

[Joseph Marrero]

commit e577ba60266eb0579dc5c0c748cd836b6b4ebc40
Merge: 839700f 1d2a343
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Sat Oct 26 21:45:29 2013 -0400

    Merge branch 'master' into f18

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