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

[Colin Walters]

commit c7179d63e7b966872d7082f9f1b7d7f9bf434f5c
Merge: 8cdf4a3 4eb4e3a
Author: Colin Walters <walters at verbum.org>
Date:   Wed Dec 17 12:37:26 2014 -0500

    Merge branch 'master' into f21

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