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

[Rex Dieter]

commit d0c353739ec7437fa4980def0adbb97a017e3038
Merge: 93a8cc3 83c1873
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:30:30 2014 -0500

    Merge branch 'master' into f20

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