It's now possible for the users to ask for a new activation key if the old one is expired
fr locale grammar fix
Merge pull request #311 from spout/patch-1

French grammar.
Merge pull request #294 from nephila/feature/activation_retry_1.2

Add activation retry option.
v1.2.1
Fixing the User admin NotRegisted exception throwed when using Django 1.5's custom user model feature
Merge pull request #325 from h3/master

Fixing issue #324 for Django 1.5
Fixed several grammar and formatting issues.
Merge pull request #328 from ckirkman/patch-1

Fixed several grammar and formatting issues.
Merge branch 'release/v1.2.1' into dev
Merge remote-tracking branch 'upstream/master' into dev
change version
Merge branch 'release/v1.2.2'