commit 240fb92d8d9b393b5e360005c7e4dacf3555f58b Merge: 357c460 3c79078 Author: Massimo <massimo.paladin at gmail.com> Date: Mon Feb 24 17:14:00 2014 +0100 Merge branch 'master' into el6 .gitignore | 1 + python-dirq.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---