[guitarix/f16: 3/3] Merge branch 'master' into f16

[Brendan Jones]

commit 67d84637811a03ac85679f26c793d787b1167200
Merge: c1af120 c9057ea
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sat Jul 28 07:19:37 2012 +0200

    Merge branch 'master' into f16

 .gitignore               |    1 +
 guitarix.spec            |   10 ++++++++--
 guitarix2-0.23.2.tar.bz2 |  Bin 4450457 -> 0 bytes
 sources                  |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
---