Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 0 insertions, 147 deletions

diff --git a/extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg b/extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg
deleted file mode 100644
index 69c9c5a1..00000000
--- a/extensions/WikiEditor/modules/images/toolbar/format-bold-N.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg4055"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="format-bold-G.svg">
-  <defs
-     id="defs4057">
-    <filter
-       id="filter5056"
-       inkscape:label="Diffuse light"
-       inkscape:menu="ABCs"
-       inkscape:menu-tooltip="Basic diffuse bevel to use for building textures"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur5058"
-         stdDeviation="6"
-         in="SourceGraphic"
-         result="result0" />
-      <feDiffuseLighting
-         id="feDiffuseLighting5060"
-         diffuseConstant="1"
-         surfaceScale="10"
-         result="result5">
-        <feDistantLight
-           id="feDistantLight5062"
-           elevation="25"
-           azimuth="235" />
-      </feDiffuseLighting>
-      <feComposite
-         id="feComposite5064"
-         in2="SourceGraphic"
-         k1="1"
-         in="result5"
-         result="result4"
-         operator="arithmetic"
-         k2="0"
-         k3="0.6" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3908">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.35953125"
-         id="feGaussianBlur3910" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3912">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.28933594"
-         id="feGaussianBlur3914" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3953">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.30832031"
-         id="feGaussianBlur3955" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3973">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.41109375"
-         id="feGaussianBlur3975" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="18.020141"
-     inkscape:cy="12.116664"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1014"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4060">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-523.28571,-512.07648)">
-    <text
-       xml:space="preserve"
-       style="font-size:17.60938835px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#444444;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif"
-       x="566.91028"
-       y="492.98608"
-       id="text5195"
-       sodipodi:linespacing="125%"
-       transform="scale(0.93034878,1.0748657)"><tspan
-         sodipodi:role="line"
-         id="tspan5197"
-         x="566.91028"
-         y="492.98608"
-         style="font-weight:bold;fill:#444444;fill-opacity:1;-inkscape-font-specification:DejaVu Serif Bold">N</tspan></text>
-    <path
-       style="font-size:17.60938834999999969px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif;filter:url(#filter3973)"
-       d="m 531.75446,516.10773 6.84375,9.25 0,-0.1875 -6.71875,-9.0625 -0.125,0 z m 9.5,0 0,0.59375 -1.53125,0 0,12.6875 -1.96875,0 0.375,0.5 2.09375,0 0,-12.6875 1.53125,0 0,-1.09375 -0.5,0 z m -13.125,0.59375 0,0.5 1.03125,0 0,-0.5 -1.03125,0 z m 9.4375,0 0,0.5 1.03125,0 0,-0.5 -1.03125,0 z m -7.28125,2.71875 0,8.84375 0.5,0 0,-8.15625 -0.5,-0.6875 z m 1.53125,9.34375 0,0.625 -3.6875,0 0,0.5 4.1875,0 0,-1.125 -0.5,0 z"
-       id="text3939"
-       inkscape:connector-curvature="0" />
-    <path
-       style="font-size:17.60938834999999969px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Serif;-inkscape-font-specification:DejaVu Serif;filter:url(#filter3953);opacity:0.8"
-       d="m 528.12946,516.10773 0,1.09375 0.5,0 0,-0.59375 3.625,0 -0.375,-0.5 -3.75,0 z m 9.4375,0 0,1.09375 0.5,0 0,-0.59375 3.6875,0 0,-0.5 -4.1875,0 z m -7.90625,1.59375 0,11.0625 -1.53125,0 0,1.125 0.5,0 0,-0.625 1.53125,0 0,-11.5625 -0.5,0 z m 9.4375,0 0,7.96875 0.5,0.6875 0,-8.65625 -0.5,0 z m -7.8125,2.71875 0,0.1875 6.84375,9.28125 0.125,0 -6.96875,-9.46875 z m 0,8.34375 0,0.5 1.03125,0 0,-0.5 -1.03125,0 z"
-       id="text3935"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>