[drbd/f21: 2/2] Merge branch 'master' into f21

[Major Hayden]

commit bb8b23c85912c8a9b49440408e57eee4fdca1c52
Merge: 5cd8cb5 a538be5
Author: Major Hayden <major at mhtx.net>
Date:   Thu Aug 7 07:20:53 2014 -0500

    Merge branch 'master' into f21

 drbd.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---