[tntnet/f18: 2/2] Merge branch 'master' into f18

[Martin Gansser]

commit 9ae725e0d9322600e53d4e38d537378ae44d5fe9
Merge: 067f108 09ee9c5
Author: Martin Gansser <mgansser at alice.de>
Date:   Thu May 9 13:40:16 2013 +0200

    Merge branch 'master' into f18

 clog                     |    4 ++--
 tntnet-conf-fedora.patch |   13 -------------
 tntnet-gcc47_fixes.patch |   10 ----------
 tntnet.spec              |    9 ++++++---
 4 files changed, 8 insertions(+), 28 deletions(-)
---