[poxml/f20: 5/5] Merge branch 'master' into f20

[Rex Dieter]

commit 5f62da256f16f7d8c08b97a1a1c44bb506038bea
Merge: 27916aa ea43f53
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:41:19 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    3 +++
 poxml.spec |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---