Merge remote-tracking branch 'origin/master'

Conflicts:
	euscanwww/djeuscan/templates/euscan/accounts/euscan_email.txt

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
This commit is contained in:
Corentin Chary
2012-09-14 10:31:19 +02:00
6 changed files with 12 additions and 3 deletions

View File

@ -29,3 +29,4 @@ Watching {{ num_packages }} package{{ num_packages|pluralize:"s"}}: {{ packages_
{% endif %}{% endif %}{% endwith %}
--
This email was sent by euscan, please do not reply.
Go to your euscan account to change email notification settings.