[guacamole-client/f19: 12/12] Merge branch 'master' into f19

[Simone Caronni]

commit 6af8a2a5cf0d2a321bc981f843fb597c4b5285ed
Merge: d97a3c4 9deab05
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Feb 26 10:06:02 2014 +0100

    Merge branch 'master' into f19

 guacamole-client.spec |   64 +++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 34 deletions(-)
---