[bcache-tools/f20: 3/3] Merge branch 'master' into f20

[Rolf Fokkens]

commit 9707216b0764c73c9d39d00d6b9f72fb8e4214cf
Merge: 7caf5bd d3252f2
Author: Rolf Fokkens <rolf.fokkens at target-holding.nl>
Date:   Sat May 10 20:37:42 2014 +0200

    Merge branch 'master' into f20

 .gitignore        |    1 +
 bcache-tools.spec |   20 ++++++++++----------
 sources           |    3 +--
 3 files changed, 12 insertions(+), 12 deletions(-)
---