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

[Robert Scheck]

commit 48af96108f46a3454aa2503a3e659fcc42e5a8e7
Merge: 630f7c5 04f1b08
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Mar 2 00:45:54 2014 +0100

    Merge remote branch 'origin/master' into el6

 drbdlinks.spec |    5 ++++-
 sources        |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---