Merge remote-tracking branch 'gitvannes/master'
authorXavier Roche <xavier.roche@eurogiciel.fr>
Tue, 25 Jun 2013 14:58:35 +0000 (16:58 +0200)
committerXavier Roche <xavier.roche@eurogiciel.fr>
Tue, 25 Jun 2013 14:58:35 +0000 (16:58 +0200)

Trivial merge