Merge remote-tracking branch 'upstream/master' into bootstrap

Conflicts:
	view/php/theme_init.php

1 files changed, 39 insertions, 0 deletions

diff --git a/util/wp/post_to_red/readme.txt b/util/wp/post_to_red/readme.txt
new file mode 100644
index 000000000..e27c46236
--- /dev/null
+++ b/util/wp/post_to_red/readme.txt
@@ -0,0 +1,39 @@
+=== CrossPost to redmatrix ===
+Contributors: duthied, macgirvin
+Donate link: TBD
+Tags: redmatrix, crosspost
+Requires at least: 3.2
+Tested up to: 3.2
+Stable tag: 1.2
+
+CrossPost to Red Matrix for WordPress
+
+== Description ==
+This plugin allows you to cross post to your Red Matrix account.
+
+**Note, this plugin converts the html from wordpress into bbcode.  
+The bbcode conversion doesn't handle height and width of an image, so be warned that if you post a very large
+image that is resized via height and with attributes, those attributes won't be honored in the resulatant post.
+
+== Changelog ==
+= 1.2 =
+* ensured no function name collision
+
+= 1.1 =
+* Added feedback to settings form post.
+
+= 1.0 =
+* Initial release.
+
+== Installation ==
+
+1. Install the plugin from your Wordpress admin panel.
+
+OR
+
+1. Upload the plugin folder to the `/wp-content/plugins/` directory.
+2. Activate the plugin through the 'Plugins' menu in WordPress.
+3. On the settings page enter your account name and password and the nickname of the channel to post to -  then click the submit button
+4. To cross-post ensure the check box in the 'Cross Post To redmatrix' is checked before publishing.
+
+== Frequently Asked Questions ==