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

[Robert Scheck]

commit 59f832ed8cf516bb829357f2df7fb22aae9e4122
Merge: b8f4935 04f1b08
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Mar 2 00:46:32 2014 +0100

    Merge remote branch 'origin/master' into el5

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