commit d50d5d308974d97da2b37d6654b547d32b777d25 Merge: e8de5de 43da277 Author: Rex Dieter <rdieter at math.unl.edu> Date: Thu Jan 24 06:09:17 2013 -0600 Merge branch 'f18' into f17 .gitignore | 3 +-- sources | 2 +- tomahawk.spec | 25 +++++++++++++++++++------ 3 files changed, 21 insertions(+), 9 deletions(-) ---