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

[Simone Caronni]

commit 8a4153624a366fba2158b00d3e23a9460a4d24ca
Merge: cc7447e 4c60146
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Sep 13 11:30:38 2012 +0200

    Merge branch 'master' into f17

 .gitignore   |    1 +
 libguac.spec |    8 ++++++--
 sources      |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---