commit 3983b1b10accd6d359cf0f0bd9612d28374f8a43 Merge: 087a346 3782381 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Dec 28 17:56:04 2012 -0600 Merge branch 'f18' into f17 .gitignore | 1 + oxygen-icon-theme.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---