Merge branch 'dev'
authorjpiron <jpiron@pagesjaunes.fr>
Tue, 10 Dec 2013 08:41:04 +0000 (09:41 +0100)
committerjpiron <jpiron@pagesjaunes.fr>
Tue, 10 Dec 2013 08:41:04 +0000 (09:41 +0100)

Trivial merge