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

[Rex Dieter]

commit e9233d5a9904f54a196ccb1fa73259c1ae968538
Merge: 5f62da2 2ec9123
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 22:29:25 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    1 +
 poxml.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---