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

[Robert Scheck]

commit 630f7c5d8b9814429b5eb5eff1234aa2b58057f9
Merge: 999a0ea d3914b6
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 13 23:06:24 2013 +0200

    Merge remote branch 'origin/master' into el6

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