[qrencode/f15: 2/2] Merge branch 'master' into f15

[fantom]

commit d2c3d045ea2ba391d8ebb319aa4d61ba0a72bb43
Merge: ccfd744 289f53f
Author: Matthieu Saulnier <fantom at fedoraproject.org>
Date:   Sat Jun 23 23:11:16 2012 +0200

    Merge branch 'master' into f15

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