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

[Rex Dieter]

commit 3eb98633b97fdf2e8b387f1fd5e5c820d985d518
Merge: 5b420c2 c11d774
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:07:11 2015 -0600

    Merge branch 'master' into f20

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