[rpm-ostree/f21: 2/2] Merge branch 'master' into f21

[Colin Walters]

commit 8cdf4a3547df644ae4f60a9e081c1eae9caebfff
Merge: b0e95b9 fc4d371
Author: Colin Walters <walters at verbum.org>
Date:   Mon Dec 1 20:18:01 2014 -0500

    Merge branch 'master' into f21

 .gitignore      |    1 +
 rpm-ostree.spec |    5 ++++-
 sources         |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---