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

[Rex Dieter]

commit b5de6d106e5126d15d08beb298f854c2d9a91283
Merge: 3536995 a8041f0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 14:30:48 2014 -0600

    Merge branch 'master' into f20

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