[drbdlinks/el5: 2/2] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit b8f4935b4bf702fee290c32d32f28c7b91e77a41
Merge: 979fb30 d3914b6
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 13 23:07:00 2013 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore     |    3 +--
 drbdlinks.spec |    7 ++++++-
 sources        |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---