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

[Simone Caronni]

commit 6924f322dac89354539a7b71e2b8d94a906954ee
Merge: 9307d08 726d746
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Oct 22 13:49:29 2012 +0200

    Merge branch 'master' into f18

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