Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 0 insertions, 37 deletions

diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
deleted file mode 100644
index eee88c15..00000000
--- a/themes/default/css/fix-ie.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Fix display in IE 6, 7
- */
-
-#gBanner,
-.gBreadcrumbs,
-#gAlbumGrid,
-#gPager,
-#gViewMenu  {
-  zoom: 1;
-}
-
-#gBanner {
-  z-index: 2;
-}
-
-input.submit {
-  clear: none !important;
-  display: inline !important;
-}
-
-#gAddTagForm input.textbox {
-  width: 110px;
-}
-
-#gDialog a.gCancel {
-  display: inline-block !important;
-  float: none !important;
-}
-
-.gPager .txtright {
-  width: 29%;
-}
-
-.gPager .ui-icon-right {
-  width: 60px;
-}