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, 2 insertions, 2 deletions

diff --git a/library/phpsec/Net/SSH1.php b/library/phpsec/Net/SSH1.php
index 6986a8450..7220ee402 100755
--- a/library/phpsec/Net/SSH1.php
+++ b/library/phpsec/Net/SSH1.php
@@ -730,8 +730,8 @@ class Net_SSH1 {
     /**

      * Reads the output of an interactive shell.

      *

-     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see stuff like

-     * "", you're seeing ANSI escape codes.  According to

+     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see crap, 

+     * you're seeing ANSI escape codes.  According to

      * {@link http://support.microsoft.com/kb/101875 How to Enable ANSI.SYS in a Command Window}, "Windows NT

      * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user,

      * there's not going to be much recourse.