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)
commitaefe61b9cb4cffb48b408f0a10705308c73c3e86
tree3a45c943c6acfc83f8812dc6777f871b117db4d1
parent85954d666118c91eac3e80ff861c5634b44c9bd8
parent863fc558ef815552893a82e08acabc9772648774
Merge branch 'dev'