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

[Simone Caronni]

commit 0f95264866c4b32244f7696ab62498818043054b
Merge: 34cf4f7 30f9ad1
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Dec 13 14:53:31 2012 +0100

    Merge branch 'master' into el6

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