# HG changeset patch
# User cavaliet
# Date 1408466033 -7200
# Node ID c949cb4316136b9ad003992d5368b34e2325ad35
# Parent  eab6629b5b31d8399d3431057ff6aca7a079700e# Parent  15b33960cf03c99df5d3a0cd6d9223130f1131a6
Merge with 15b33960cf03c99df5d3a0cd6d9223130f1131a6

diff -r eab6629b5b31 -r c949cb431613 .hgtags
--- a/.hgtags	Tue Aug 19 18:29:35 2014 +0200
+++ b/.hgtags	Tue Aug 19 18:33:53 2014 +0200
@@ -66,3 +66,6 @@
 2986e2d0fa3bcdb941694894fbd9ccef030c4988 V02.21
 0368e86e4cbdb20ae42c958da49c2018843c1290 V02.21
 da962b8b5bce839c286e2f55d29caf90d180eafa V02.22
+88d36ba3f6c9423cbd4a3794c08b8cabae8023b7 V02.23
+88d36ba3f6c9423cbd4a3794c08b8cabae8023b7 V02.23
+e091c7ea3f9033154df96da562fc3a60458cb948 V02.23
diff -r eab6629b5b31 -r c949cb431613 src/hdabo/django_wsgi.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdabo/django_wsgi.py	Tue Aug 19 18:33:53 2014 +0200
@@ -0,0 +1,10 @@
+import os
+
+import django.core.handlers.wsgi
+
+application = django.core.handlers.wsgi.WSGIHandler()
+
+if os.environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]:
+    import pydevd #@UnresolvedImport
+    pydevd.settrace(suspend=False)
+    
diff -r eab6629b5b31 -r c949cb431613 src/hdabo/settings.py
--- a/src/hdabo/settings.py	Tue Aug 19 18:29:35 2014 +0200
+++ b/src/hdabo/settings.py	Tue Aug 19 18:33:53 2014 +0200
@@ -130,8 +130,6 @@
     'django_extensions',
     'registration',
     'haystack',
-    'hdalab',
-    'renkanmanager',
     'easy_thumbnails',
 )
 
diff -r eab6629b5b31 -r c949cb431613 src/hdabo/urls.py
--- a/src/hdabo/urls.py	Tue Aug 19 18:29:35 2014 +0200
+++ b/src/hdabo/urls.py	Tue Aug 19 18:33:53 2014 +0200
@@ -3,7 +3,6 @@
 from django.contrib.auth import urls as auth_url, views as auth_views
 from django.contrib.auth.decorators import login_required
 from .views import AddOrUpdateFolder, Folders, SearchDatasheet, DeleteFolder
-from hdalab import urls as hdalab_url
 
 
 # Uncomment the next two lines to enable the admin:
@@ -55,5 +54,4 @@
     url(r'^folder/(?P<folder_pk>[\w-]+)$', login_required(AddOrUpdateFolder.as_view()), name='add_or_update_folder'),
     url(r'^searchajax/$', login_required(SearchDatasheet()), name='searchajax'),
     url(r'^deletefolder/(?P<folder_pk>[\w-]+)$', login_required(DeleteFolder.as_view()), name='delete_folder'),
-    url(r'^hdalab/', include(hdalab_url)),
 )