Merge branch 'feature/kevin/email_notifications_panel' of…

Merge branch 'feature/kevin/email_notifications_panel' of https://github.com/edx/edx-platform into feature/kevin/email_notifications_panel

lms/djangoapps/django_comment_client/forum/urls.py

@@ -4,7 +4,6 @@ urlpatterns = patterns('django_comment_client.forum.views',  # nopep8
     url(r'users/(?P<user_id>\w+)/followed$', 'followed_threads', name='followed_threads'),
     url(r'users/(?P<user_id>\w+)$', 'user_profile', name='user_profile'),
     url(r'^(?P<discussion_id>[\w\-.]+)/threads/(?P<thread_id>\w+)$', 'single_thread', name='single_thread'),
-    url(r'^(?P<discussion_id>[\w\-.]+)/threads/(?P<thread_id>\w+)$', 'single_thread', name='single_thread'),
     url(r'^(?P<discussion_id>[\w\-.]+)/inline$', 'inline_discussion', name='inline_discussion'),
     url(r'', 'forum_form_discussion', name='forum_form_discussion'),
 )