[guacamole-client/f20: 5/5] Merge branch 'master' into f20

[Simone Caronni]

commit fb6c15819ba233f727dbaeb63894c6ec701cd6c7
Merge: b8e2c3d 9deab05
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Feb 26 10:05:52 2014 +0100

    Merge branch 'master' into f20

 guacamole-client.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---