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

[mpaladin]

commit f74e05497d0dd4678b30bd70d981a32c03d248c2
Merge: 95adc1e 95f4554
Author: Massimo <massimo.paladin at gmail.com>
Date:   Tue Feb 25 10:22:01 2014 +0100

    Merge branch 'master' into el5

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