Merge remote-tracking branch 'hernic/patch-4' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 27 Sep 2013 04:29:50 +0000 (06:29 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 27 Sep 2013 04:29:50 +0000 (06:29 +0200)
commit131a7e74b3417a8b8fe3132da018a13286652509
treea69f81b901487da5ea9505b7f0073640014878a5
parent629ddb006542df2b671e172d8f544815bbab639b
parent48ebbf16c67f4fa1fd904bc1fe92da24e4bdcbe9
Merge remote-tracking branch 'hernic/patch-4' into next
src/main/resources/i18n/sone.fr.properties