Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 4 insertions, 1 deletions

diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 608ca3251..98bd55106 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -20,18 +20,21 @@
 from django.conf import settings
 from django.conf.urls.defaults import patterns, include, url
 from django.conf.urls.static import static
+from django.views.generic.simple import direct_to_template
 
 from menus import menu
 
 from ishtar_common import views
 from ishtar_common.wizards import check_rights
 
-# be carreful: each check_rights must be relevant with ishtar_menu
+# be careful: each check_rights must be relevant with ishtar_menu
 
 # forms
 urlpatterns = patterns(
     '',
     url(r'^status/$', views.status, name='status'),
+    url(r'^robots\.txt$', direct_to_template,
+        {'template': 'robots.txt', 'mimetype': 'text/plain'}),
     # internationalization
     url(r'^i18n/', include('django.conf.urls.i18n')),
     # General