Merge branch 'master' into subscription

* master: (175 commits)
  some coding style improvements
  added .idea project folder to gitignore
  use correct setUp method and parent calls.
  Correct German plugin manager translation (download != install)
  correct return in sendDigest()
  Fix case-insensitive match in ACL checking
  GeSHi update to 1.0.8.11
  ignore empty header on mail sending
  remove empty BCC/CC mail headers
  Galician language update
  some welcome page changes
  Combine subsequent calls to strtr into a single transformation
  changed semicolon to colon in link to welcome page to make it less confusing
  fixed wrong sidebar showing in namespaces when sidebar is disabled
  Typo fix for TL;DR
  removed a bunch of outdated and irrelevant networking acronyms
  added another place to look for logo to make it more consistent (FS#2656)
  French language update
  Czech language update
  compat js findPosX/y more closely mimic historical function
  ...

Conflicts:
	inc/auth.php
	inc/common.php
	inc/subscription.php
	lib/exe/indexer.php

20 files changed, 66 insertions, 0 deletions

diff --git a/lib/images/README b/lib/images/README
new file mode 100644
index 000000000..e2788b400
--- /dev/null
+++ b/lib/images/README
@@ -0,0 +1,6 @@
+
+Icons:      email.png, external-link.png, unc.png
+Icon set:   Dusseldorf
+Designer:   pc.de
+License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
+URL:        http://pc.de/icons/#Dusseldorf
diff --git a/lib/images/_deprecated.txt b/lib/images/_deprecated.txt
new file mode 100644
index 000000000..bccea2049
--- /dev/null
+++ b/lib/images/_deprecated.txt
@@ -0,0 +1,12 @@
+
+== @deprecated 2012-10-06 ==
+
+arrow_down.gif
+arrow_up.gif
+at.gif
+close.png
+del.png
+edit.gif
+list-minus.gif
+list-plus.gif
+pencil.png
diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif
new file mode 100644
index 000000000..ff13b9585
--- /dev/null
+++ b/lib/images/arrow_down.gif
diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif
new file mode 100644
index 000000000..d491c18db
--- /dev/null
+++ b/lib/images/arrow_up.gif
diff --git a/lib/images/at.gif b/lib/images/at.gif
new file mode 100644
index 000000000..8bdf40d54
--- /dev/null
+++ b/lib/images/at.gif
diff --git a/lib/images/bullet.png b/lib/images/bullet.png
new file mode 100644
index 000000000..5e557b334
--- /dev/null
+++ b/lib/images/bullet.png
diff --git a/lib/images/close.png b/lib/images/close.png
new file mode 100644
index 000000000..4ccef0603
--- /dev/null
+++ b/lib/images/close.png
diff --git a/lib/images/closed-rtl.png b/lib/images/closed-rtl.png
new file mode 100644
index 000000000..caa027e34
--- /dev/null
+++ b/lib/images/closed-rtl.png
diff --git a/lib/images/closed.png b/lib/images/closed.png
new file mode 100644
index 000000000..e3bd0f9e9
--- /dev/null
+++ b/lib/images/closed.png
diff --git a/lib/images/del.png b/lib/images/del.png
new file mode 100644
index 000000000..e59ded55f
--- /dev/null
+++ b/lib/images/del.png
diff --git a/lib/images/edit.gif b/lib/images/edit.gif
new file mode 100644
index 000000000..a2a23de7b
--- /dev/null
+++ b/lib/images/edit.gif
diff --git a/lib/images/email.png b/lib/images/email.png
new file mode 100644
index 000000000..d1d4a5fd5
--- /dev/null
+++ b/lib/images/email.png
diff --git a/lib/images/external-link.png b/lib/images/external-link.png
new file mode 100644
index 000000000..a4d5de17c
--- /dev/null
+++ b/lib/images/external-link.png
diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif
new file mode 100644
index 000000000..36902f159
--- /dev/null
+++ b/lib/images/list-minus.gif
diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif
new file mode 100644
index 000000000..adc3fac8a
--- /dev/null
+++ b/lib/images/list-plus.gif
diff --git a/lib/images/open.png b/lib/images/open.png
new file mode 100644
index 000000000..5f2d408c5
--- /dev/null
+++ b/lib/images/open.png
diff --git a/lib/images/pencil.png b/lib/images/pencil.png
new file mode 100644
index 000000000..78142b61e
--- /dev/null
+++ b/lib/images/pencil.png
diff --git a/lib/images/resizecol.png b/lib/images/resizecol.png
new file mode 100644
index 000000000..b5aeec004
--- /dev/null
+++ b/lib/images/resizecol.png
diff --git a/lib/images/smileys/index.php b/lib/images/smileys/index.php
new file mode 100644
index 000000000..9a2905b33
--- /dev/null
+++ b/lib/images/smileys/index.php
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+<head>
+    <title>simleys</title>
+
+    <style type="text/css">
+        body {
+            background-color: #ccc;
+            font-family: Arial;
+        }
+
+        .box {
+            width: 200px;
+            float:left;
+            padding: 0.5em;
+            margin: 0;
+        }
+
+        .white {
+            background-color: #fff;
+        }
+
+        .black {
+            background-color: #000;
+        }
+    </style>
+
+</head>
+<body>
+
+<div class="white box">
+<?php
+foreach (glob('*.gif') as $img) {
+    echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+}
+?>
+</div>
+
+<div class="black box">
+<?php
+foreach (glob('*.gif') as $img) {
+    echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+}
+?>
+</div>
+
+</body>
+</html>
diff --git a/lib/images/unc.png b/lib/images/unc.png
new file mode 100644
index 000000000..a552d6e6f
--- /dev/null
+++ b/lib/images/unc.png