[python-dirq/el5: 2/2] Merge branch 'master' into el5

[mpaladin]

commit 0d63919f9757636d2393f4523e0d99511f89874c
Merge: 6d0ed23 fe1cfb2
Author: Massimo <massimo.paladin at gmail.com>
Date:   Tue Jun 25 09:48:06 2013 +0200

    Merge branch 'master' into el5

 .gitignore       |    1 +
 python-dirq.spec |    5 ++++-
 sources          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---