[mediatomb/f17: 2/2] Merge branch 'f18' into f17

[Jon Ciesla]

commit 4df483e09b9c6b869ece99570470a403f700abda
Merge: 7eb6622 5753ece
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jul 11 08:00:41 2013 -0500

    Merge branch 'f18' into f17

 mediatomb-mysql.service |   15 +++++++++++++++
 mediatomb.spec          |   19 +++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
---