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

[Joseph Marrero]

commit cf13990278fc0e60ecf27660e71a7018b160f19c
Merge: 1803418 967f89d
Author: joseph <joseph at localhost.localdomain>
Date:   Wed Apr 3 13:19:23 2013 -0400

    Merge branch 'master' into f18

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