[spice-gtk/f20: 2/2] Merge branch 'master' into f20

[Marc-André Lureau]

commit a98b1c824c15437b06bdffb2b8efd0ba3206cc25
Merge: 9c4a8a7 49ee056
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Tue Feb 25 17:14:08 2014 +0100

    Merge branch 'master' into f20

 ...-fix-crash-when-releasing-primary-surface.patch |   39 ++++++++++++++++++++
 spice-gtk.spec                                     |    7 +++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---