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

[mpaladin]

commit bf4d37d97b7a08b5a9f5a13f37a4978595d36665
Merge: 240fb92 95f4554
Author: Massimo <massimo.paladin at gmail.com>
Date:   Tue Feb 25 10:21:54 2014 +0100

    Merge branch 'master' into el6

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