Merge branch 'master' into stable

1 files changed, 3 insertions, 2 deletions

diff --git a/pv/urls.py b/pv/urls.py
index 3c0ab4d..9873723 100644
--- a/pv/urls.py
+++ b/pv/urls.py
@@ -2,7 +2,7 @@ from django.conf import settings
 from django.conf.urls import patterns, url, include
 from django.contrib import admin
 
-from program.views import json_day_schedule
+from program.views import json_day_schedule, json_timeslots_specials
 
 admin.autodiscover()
 
@@ -11,7 +11,8 @@ urlpatterns = patterns('',
                        url(r'^program/', include('program.urls')),
                        url(r'^nop', include('nop.urls')),
                        url(r'^tinymce/', include('tinymce.urls')),
-                       url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule)
+                       url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule),
+                       url(r'^export/timeslots_specials/$', json_timeslots_specials)
                        )
 
 if settings.DEBUG: