Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 27 insertions, 0 deletions

diff --git a/extensions/Poem/extension.json b/extensions/Poem/extension.json
new file mode 100644
index 00000000..1b8672ee
--- /dev/null
+++ b/extensions/Poem/extension.json
@@ -0,0 +1,27 @@
+{
+	"name": "Poem",
+	"author": [
+		"Nikola Smolenski",
+		"Brion Vibber",
+		"Steve Sanbeg"
+	],
+	"url": "https://www.mediawiki.org/wiki/Extension:Poem",
+	"descriptionmsg": "poem-desc",
+	"type": "parserhook",
+	"MessagesDirs": {
+		"Poem": [
+			"i18n"
+		]
+	},
+	"Hooks": {
+		"ParserFirstCallInit": [
+			"Poem::init"
+		]
+	},
+	"AutoloadClasses": {
+		"Poem": "Poem.class.php"
+	},
+	"ParserTestFiles": [
+		"poemParserTests.txt"
+	]
+}