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

[Rex Dieter]

commit cc3b76704f7225ad5c4b6dbc7e4417eba15df25e
Merge: 0d7eec1 777e563
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 11:04:43 2014 -0600

    Merge branch 'master' into f20

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