Merge branch 'fdn-mods'
authorBenjamin Cama <benoar@dolka.fr>
Tue, 3 Jan 2012 19:23:14 +0000 (20:23 +0100)
committerBenjamin Cama <benoar@dolka.fr>
Tue, 3 Jan 2012 19:23:14 +0000 (20:23 +0100)

Trivial merge