re-enable x-frame-options; bug 596052

settings.py

@@ -205,8 +205,7 @@ MIDDLEWARE_CLASSES = (
     # Munging REMOTE_ADDR must come before ThreadRequest.
     'commonware.middleware.SetRemoteAddrFromForwardedFor',
 
-    # Commented out for bug 595634; re-enable in bug 596052
-    # 'commonware.middleware.FrameOptionsHeader',
+    'commonware.middleware.FrameOptionsHeader',
     'commonware.log.ThreadRequestMiddleware',
     'multidb.middleware.PinningRouterMiddleware',