# HG changeset patch
# User veltr
# Date 1380290969 -7200
# Node ID dd5358d4d2acfde7e83295238d736dd03cbc64fd
# Parent  62b6761a61c58a57ddd65ec7f0c3cfde62439aa6# Parent  11f2aa317b7092b7dae74b5f103f87124290606d
Merge with 1487dcf42f0e25d9268d4844d363f99e5a1941db

diff -r 11f2aa317b70 -r dd5358d4d2ac .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Fri Sep 27 15:58:40 2013 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Fri Sep 27 16:09:29 2013 +0200
@@ -1,9 +1,27 @@
-eclipse.preferences.version=1
-encoding//src/core/migrations/0008_populate_nb_notice.py=utf-8
-encoding//src/core/models/term.py=utf-8
-encoding//src/jocondelab/management/commands/import_terms.py=utf-8
-encoding//src/jocondelab/migrations/0005_auto__add_termlinks__add_dbpediafields.py=utf-8
-encoding//src/jocondelab/settings.py=utf-8
-encoding//src/jocondelab/utils.py=utf-8
-encoding//src/jocondelab/views/back_office.py=utf-8
-encoding//virtualenv/web/env/venv_jocondelab/lib/python2.7/site-packages/django/conf/locale/vi/formats.py=utf-8
+eclipse.preferences.version=1
+encoding//src/core/migrations/0008_populate_nb_notice.py=utf-8
+encoding//src/core/models/notice.py=utf-8
+encoding//src/core/models/term.py=utf-8
+encoding//src/core/settings.py=utf-8
+encoding//src/get_notice_years.py=utf-8
+encoding//src/jocondelab/management/commands/import_countries.py=utf-8
+encoding//src/jocondelab/management/commands/import_csv.py=utf-8
+encoding//src/jocondelab/management/commands/import_dbpedia_fields.py=utf-8
+encoding//src/jocondelab/management/commands/import_dbpedia_geo_years.py=utf-8
+encoding//src/jocondelab/management/commands/import_extra_years.py=utf-8
+encoding//src/jocondelab/management/commands/import_skos.py=utf-8
+encoding//src/jocondelab/management/commands/import_term_labels.py=utf-8
+encoding//src/jocondelab/management/commands/import_term_list.py=utf-8
+encoding//src/jocondelab/management/commands/import_terms.py=utf-8
+encoding//src/jocondelab/management/commands/populate_notice_years.py=utf-8
+encoding//src/jocondelab/migrations/0005_auto__add_termlinks__add_dbpediafields.py=utf-8
+encoding//src/jocondelab/migrations/0012_auto__add_notice_years.py=utf-8
+encoding//src/jocondelab/models/contribution.py=utf-8
+encoding//src/jocondelab/models/data.py=utf-8
+encoding//src/jocondelab/models/displaysettings.py=utf-8
+encoding//src/jocondelab/settings.py=utf-8
+encoding//src/jocondelab/utils.py=utf-8
+encoding//src/jocondelab/views/ajax.py=utf-8
+encoding//src/jocondelab/views/back_office.py=utf-8
+encoding//src/jocondelab/views/front_office.py=utf-8
+encoding//virtualenv/web/env/venv_jocondelab/lib/python2.7/site-packages/django/conf/locale/vi/formats.py=utf-8
diff -r 11f2aa317b70 -r dd5358d4d2ac src/jocondelab/settings.py
--- a/src/jocondelab/settings.py	Fri Sep 27 15:58:40 2013 +0200
+++ b/src/jocondelab/settings.py	Fri Sep 27 16:09:29 2013 +0200
@@ -52,6 +52,7 @@
     ('ca', ugettext('Catalan')),
     ('eu', ugettext('Basque')),
     ('br', ugettext('Breton')),
+    ('oc', ugettext('Occitan')),
 )
 
 
diff -r 11f2aa317b70 -r dd5358d4d2ac virtualenv/res/src/django-1.5.4-IRI.tar.gz
Binary file virtualenv/res/src/django-1.5.4-IRI.tar.gz has changed