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

[Rex Dieter]

commit 428486fdad8a2489513e93f4779b646a650c9b13
Merge: ab464a0 df6bfe6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 19:38:29 2015 -0600

    Merge branch 'master' into f20

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