Merge branch '0.98'

Conflicts:
	build.xml

diff --cc build.xml
index d7735c8ef8ded46fcf3d2a0d7524c0ab7bfa0d6c,e60e861e3cbc8faac6ad0e34ff93b5022f3d3500..f50499bb7e9207e3236fd0b8f4b5cb7d78ab9a70
--- 1/build.xml
--- 2/build.xml
+++ b/build.xml
@@@ -27,32 -26,6 +26,34 @@@ contained it - thus no 0.98.3 PEAR pack
    <property name="sffilepath"  value="s/se/semanticscuttle/" />
    <property name="svnpath"     value="https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/" />
  
 +  <fileset id="fs.zip" dir=".">
 +   <include name="data/**"/>
 +   <include name="doc/**"/>
 +   <include name="src/**"/>
 +   <include name="www/**"/>
++   <include name="scripts/avahi-export.php"/>
++   <include name="scripts/fix-unfiled-tags.php"/>
 +   <exclude name="**/.gitignore/"/>
 +   <exclude name="**/.svn/"/>
 +   <exclude name="data/config.php"/>
 +   <exclude name="data/config.testing.php"/>
 +   <exclude name="data/config.testing-tmp.php"/>
 +   <exclude name="data/locales/messages.po"/>
 +   <exclude name="data/locales/*/LC_MESSAGES/messages.po"/>
 +   <exclude name="src/php-gettext/examples/" />
 +   <exclude name="src/php-gettext/tests/"/>
 +  </fileset>
 +
 +  <fileset id="fs.doc" dir="doc">
 +   <include name="ChangeLog"/>
 +   <include name="**.txt"/>
 +   <include name="**.rst"/>
 +   <include name="**/*.rst"/>
 +   <exclude name="LICENSE.txt"/>
 +   <exclude name="developers/TODO.rst"/>
 +   <exclude name="allinone.rst"/>
 +  </fileset>
 +
    <taskdef name="rST" classname="phing.tasks.ext.rSTTask" />
    <taskdef name="d51pearpkg2" classname="phing.tasks.ext.d51PearPkg2Task" />