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

[Rex Dieter]

commit 27916aaec28a7ecebda589604bc9eca476c4e801
Merge: 887b625 3c86a24
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:51:44 2014 -0500

    Merge branch 'master' into f20

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