# HG changeset patch
# User rbernard
# Date 1264104920 -3600
# Node ID 3ba2d2da386fd32b83c998ddff690caef672f96c
# Parent  49647a504de850d2ce35425603d874e3514cd762# Parent  f0d097bff6b24c351716139ea4cc4c6b91be6612
Merge with f0d097bff6b24c351716139ea4cc4c6b91be6612

diff -r 49647a504de8 -r 3ba2d2da386f src/cm/locale/TRANSLATION_LICENSE.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cm/locale/TRANSLATION_LICENSE.txt	Thu Jan 21 21:15:20 2010 +0100
@@ -0,0 +1,6 @@
+Interface translation for COMT: Web-based text annotation
+Copyright (C) 2006-2010 Sopinspace, Society for Public Information Spaces, www.sopinspace.com
+Translator name(s) indicated in each language file
+
+The translations for the interface messages are licensed under a Creative Commons Attribution License, http://creativecommons.org/licenses/by/3.0/
+
diff -r 49647a504de8 -r 3ba2d2da386f src/cm/views/user.py
--- a/src/cm/views/user.py	Thu Jan 21 21:11:32 2010 +0100
+++ b/src/cm/views/user.py	Thu Jan 21 21:15:20 2010 +0100
@@ -207,7 +207,7 @@
 class MyUserProfileForm(ModelForm):
     class Meta:
         model = UserProfile
-        fields = ('allow_contact', 'preferred_language')
+        fields = ('allow_contact', 'preferred_language', 'tags')
 
 class UserProfileAddForm(ModelForm):
     class Meta: