Fix media query merging with all

Author: mgreter

src/ast_css.cpp

@@ -288,7 +288,7 @@ namespace Sass {
 
     CssMediaQueryObj query = SASS_MEMORY_NEW(CssMediaQuery, pstate());
     query->modifier(modifier == ourModifier ? this->modifier() : other->modifier());
-    query->type(ourType.empty() ? other->type() : this->type());
+    query->type(type == ourType ? this->type() : other->type());
     query->features(features);
     return query;
   }