[plowshare/el5: 2/2] Merge branch 'master' into el5

[Elder Marco]

commit 88b212e134a5835b4aec80f2efcd9754e4975766
Merge: 6176701 c245181
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed Sep 4 19:30:03 2013 -0300

    Merge branch 'master' into el5

 .gitignore     |    1 +
 plowshare.spec |    9 ++++++---
 sources        |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---