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

[Jon Ciesla]

commit 7eb6622ee9a97006ae99da63685a8504f5267cfa
Merge: 0c4f7fd 8d879bc
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue May 14 14:15:50 2013 -0500

    Merge branch 'f18' into f17

 mediatomb-0.12.1.flacart.config.patch |   13 +++++++------
 mediatomb.spec                        |    9 ++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)
---