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

[Joseph Marrero]

commit 8e0115310ddfa1bdb455a5ff65d746390a3d7a21
Merge: db0c12a 78d5e6a
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Sat Dec 22 11:24:17 2012 -0400

    Merge branch 'master' into f18

 mirall-1.1.4.tar.bz2      |  Bin 940423 -> 0 bytes
 mirall-1.2.0beta1.tar.bz2 |  Bin 0 -> 595588 bytes
 mirall.spec               |    8 +++++---
 3 files changed, 5 insertions(+), 3 deletions(-)
---