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

[Rex Dieter]

commit d2ed737fe0750ab3e7ee4146909135896f8fd4e8
Merge: e18be52 d25e754
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:24:31 2015 -0600

    Merge branch 'master' into f20

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