commit 9c4a8a7e88cc5584dd23dd36836414f70b1d3777 Merge: 3b519b7 44f4ee2 Author: Marc-André Lureau <marcandre.lureau at gmail.com> Date: Mon Feb 10 17:46:07 2014 +0100 Merge branch 'master' into f20 .gitignore | 1 + sources | 2 +- spice-gtk.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) ---