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

[Jon Ciesla]

commit 14c5639604acbb4d7ebed8a8696d711fb7a76fd8
Merge: d55a2bb 116a659
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Apr 3 14:06:10 2013 -0500

    Merge branch 'f18' into f17

 .gitignore                              |    1 +
 mediatomb-0.12.1-unbundle-libupnp.patch |    2 +-
 mediatomb.spec                          |   47 ++++++++++++++++++------------
 sources                                 |    2 +-
 4 files changed, 31 insertions(+), 21 deletions(-)
---