Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  item table update for file feature
  probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
  diabook commit
  conversation: remove templating items in code and move it to template.
  Enabled automated doc building. Changes: -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them
  template proc: avoid a notice and allow template name to include to be passed with a variable value
  show relation in contact_template
  admin: fix small string
  fix visualization in groupeditor
  less html in mod/group.php, template for group members editor, quattro theme for group edit.

* master:

1 files changed, 7 insertions, 2 deletions

diff --git a/update.php b/update.php
index 6dbd410bc..c29394b48 100755
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1130 );
+define( 'UPDATE_VERSION' , 1131 );
 
 /**
  *
@@ -1116,4 +1116,9 @@ function update_1128() {
 
 function update_1129() {
 	q("ALTER TABLE `notify` ADD `parent` INT NOT NULL AFTER `link` , ADD INDEX ( `parent` ), ADD INDEX ( `link` ), ADD INDEX ( `otype` ) ");
-}
\ No newline at end of file
+}
+
+function update_1130() {
+	q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) ");
+}
+