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

[Elder Marco]

commit 8efcd2e99f2db996a962b2321207859fc223d19d
Merge: f1631a3 2f8f1ad
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Jan 19 13:31:27 2014 -0200

    Merge branch 'master' into el5

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