[libguac/f17: 2/2] Merge branch 'master' into f17

[Simone Caronni]

commit 9a44b4b66763082d92ed685685b8b685d683280a
Merge: 8a41536 726d746
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Oct 22 13:49:33 2012 +0200

    Merge branch 'master' into f17

 libguac.spec |    6 +++++-
 sources      |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---