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

[Simone Caronni]

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

    Merge branch 'master' into epel7

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