French translation (based on 2.3.8)
Merge pull request #141 from pippinsplugins/issue/139

Add a number field type for Issue/139
Merge pull request #131 from LeBenLeBen/master

French translation (based on 2.3.8)
Revert "First pass at adding a number field type. #139"

This reverts commit f874afdbe04bb14b30d7d9a2827a847d8d01ba9c.
Revert "Add number.php. #139"

This reverts commit 64a606329c613f83a118f20ceae2b31b4b8a959c.
Revert "French translation (based on 2.3.8)"

This reverts commit 109c5d67002c37af466940de3a20cc81f3fc64b5.
Merge branch 'release/2.4'
Merge branch 'release/v2.4.1'
Merge branch 'release/v2.4.2'
Updating to version 2.5.
Added new extensions to the "Add Ons" page and randomised the order in which those items are displayed.
Merge branch 'release/v2.5'

Conflicts:
	includes/fields/number.php