# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1417480780 21600
# Node ID 22a2362a8c9a32feb1e2a78e595a3e32aba77f54
# Parent  6e20d3b1e7c22f5eb7615bf6e3fe8674b3d7a7c1# Parent  e4f8d87c3d30d51dcecbbb3061e36ef84aa14374
Merge with upstream.

diff -r 6e20d3b1e7c2 -r 22a2362a8c9a sg101/settings/local.py
--- a/sg101/settings/local.py	Tue Nov 25 21:02:50 2014 -0600
+++ b/sg101/settings/local.py	Mon Dec 01 18:39:40 2014 -0600
@@ -94,6 +94,11 @@
             'propagate': False,
             'handlers': ['auth'],
         },
+        'MARKDOWN': {
+            'level': 'WARNING',
+            'propagate': False,
+            'handlers': ['file'],
+        },
     },
     'root': {
         'level': 'DEBUG',
diff -r 6e20d3b1e7c2 -r 22a2362a8c9a sg101/settings/production.py
--- a/sg101/settings/production.py	Tue Nov 25 21:02:50 2014 -0600
+++ b/sg101/settings/production.py	Mon Dec 01 18:39:40 2014 -0600
@@ -115,6 +115,11 @@
             'propagate': False,
             'handlers': ['auth'],
         },
+        'MARKDOWN': {
+            'level': 'WARNING',
+            'propagate': False,
+            'handlers': ['file'],
+        },
     },
     'root': {
         'level': 'INFO',