[guake/f21: 2/2] Merge branch 'master' into f21

[Pierre-YvesChibon]

commit f567028b08b95edba3732689a972570a3aac4ecb
Merge: e854e2e 3efca0c
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Tue Jan 20 16:12:34 2015 +0100

    Merge branch 'master' into f21

 .gitignore             |    1 +
 fix_resize_mouse.patch |   24 ++++++++++++++++++++++++
 guake.spec             |   21 +++++++++++++--------
 sources                |    2 +-
 4 files changed, 39 insertions(+), 9 deletions(-)
---