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

[Jon Ciesla]

commit 483ce976a305c8ab0597fa8bbe57e73e4707e456
Merge: 14c5639 5c5274e
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Apr 16 09:12:39 2013 -0500

    Merge branch 'f18' into f17

 mediatomb-0.12.1-transcode-segfault.patch |   11 -----------
 mediatomb.spec                            |    9 ++++++---
 2 files changed, 6 insertions(+), 14 deletions(-)
---