From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Tue, 8 Jul 2014 17:50:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: debian_7.5_20141208~67
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=36cd8f9baf6b0f69c4277299f066195598cb5178;hp=18348f084bcb9464cd33c0bb2a5df69215fd0e51;p=debian6500.git

Merge remote-tracking branch 'origin/master'
---