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

[Jon Ciesla]

commit 0c4f7fd835ae67abfd9e64b4500e00ae0b457a1d
Merge: 483ce97 18e4947
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue May 14 06:43:02 2013 -0500

    Merge branch 'f18' into f17

 mediatomb.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---