[oxygen-icon-theme/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit e71c78a16d56257161df8cdf496afc6bd6a95aa5
Merge: eea0f3c c07c82a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 20:50:11 2014 -0500

    Merge branch 'master' into f20

 .gitignore             |    1 +
 oxygen-icon-theme.spec |    7 +++++--
 sources                |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---