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

[Rex Dieter]

commit eea0f3cc2cfc2d18dc03ee59ba0461e06010dd64
Merge: d3e09eb 2b35b0b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 17:06:11 2014 -0500

    Merge branch 'master' into f20

 .gitignore             |    2 +-
 oxygen-icon-theme.spec |   50 ++++++++++++++++++++++++++++++++++++-----------
 sources                |    2 +-
 3 files changed, 40 insertions(+), 14 deletions(-)
---