[kdenetwork-filesharing/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 93a8cc3589fad25fddd0f75098caed0e2aa91fe9
Merge: 67f96c9 bf64339
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:51:51 2014 -0500

    Merge branch 'master' into f20

 .gitignore                  |    6 ++++++
 kdenetwork-filesharing.spec |   23 ++++++++++++++++++++++-
 sources                     |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---