[SCM] felix-main packaging branch, master, updated. debian/2.0.5-2-13-gb29eee4

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 939e7cede2bd379425ffcf06adb0d7178cd65edc
Merge: 54a986fcfc816216500c288570a28d90e9789e2b c95d7e42576c05e935ee745f80d302b5499ca9a8
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Nov 5 14:33:54 2011 +0100

    Merge commit 'upstream/4.0.1'


-- 
felix-main packaging