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

[Joseph Marrero]

commit 115677a982b474f45c194e7bdf3002df7eee1aeb
Merge: 1130e98 8058fd4
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Mon Dec 30 21:03:37 2013 -0400

    Merge branch 'master' into f19

 1c9a4784c7bce40b7ef37c60b708bf90bae7eb20.patch |   33 ++++++++++++++++++++++++
 mirall.spec                                    |   28 ++++++++++++--------
 2 files changed, 50 insertions(+), 11 deletions(-)
---