commit 887b625123c5118fcfe71f00c8ebe4d56e82646b Merge: f3c9e89 e029578 Author: Rex Dieter <rdieter at math.unl.edu> Date: Mon Jun 30 23:23:03 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ poxml.spec | 26 ++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) ---