[SCM] mediatomb/master: Merge commit 'upstream/0.12.1'

[ceros-guest at users.alioth.debian.org]

Imported Upstream version 0.12.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: db2f0656f621bd2551f3ca40c036db8a43443ce2
X-Git-Newrev: 68284ffcf4f6420d019f3de87dc2c0619f05c41d

The following commit has been merged in the master branch:
commit 68284ffcf4f6420d019f3de87dc2c0619f05c41d
Merge: cc633a371ecc0036bfcf35714f8a33372b097e36 a4318d0592c3de4adb64c4246b3cba23a4463b78
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Sep 11 22:59:02 2010 -0400

    Merge commit 'upstream/0.12.1'


-- 
MediaTomb packaging