Merge remote-tracking branch 'hernic/patch-1' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 9 Jun 2013 08:25:19 +0000 (10:25 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 9 Jun 2013 08:25:19 +0000 (10:25 +0200)
commit77804f0dda317541f8451a0649785e7cb192d696
tree9c682c9a367b06878049467f5c2a8836c931d038
parent66b03d16a393c9f02090245ea963d45ce0b4cf79
parent78df4874610a2e72eff60815bda1d944f206729b
Merge remote-tracking branch 'hernic/patch-1' into next
src/main/resources/i18n/sone.fr.properties