[SCM] flumotion/master: Merge branch 'upstream'

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

Imported Upstream version 0.10.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: 2381e1de0ffa89d5d6c56a59e2ea2416853c95a9
X-Git-Newrev: 83d2b47e8be6d6d3cc2c94edda006e6f2d3d9703

The following commit has been merged in the master branch:
commit f3924e7b23aa28dbf7cc9c79a7eaa678e3c54444
Merge: 2381e1de0ffa89d5d6c56a59e2ea2416853c95a9 cd255b57c6e313d2db0902187df3f693eb9873b0
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jan 31 16:04:09 2014 +0100

    Merge branch 'upstream'


-- 
flumotion packaging