commit 6cd5302e59b1a498c393c376c8e7501d3d1aa166 Merge: d3ac15d c74eacd Author: Rex Dieter <rdieter at gmail.com> Date: Sun Mar 1 15:20:18 2015 -0600 Merge branch 'master' into f22 .gitignore | 1 + amor.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) ---