[oxygen-icon-theme/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 087a3468083f5271b80dec91b07fb664ebc54b56
Merge: ad925c5 81ce561
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:46:12 2012 +0100

    Merge branch 'f18' into f17

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