[mldonkey/f18: 3/3] Merge branch 'master' into f18

[Peter Lemenkov]

commit 5f0b914cfa5afc83402f78b4610d1e4e2c2905e9
Merge: b43f231 43169d8
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Sep 6 17:04:28 2013 +0400

    Merge branch 'master' into f18

 mldonkey.service       |    2 ++
 mldonkey.spec          |   16 ++++++++++++++--
 mldonkey.tmpfiles.conf |    1 +
 3 files changed, 17 insertions(+), 2 deletions(-)
---