re-base on ALv2 code. Includes:

Patch contributed by Oliver Rainer-Wittmann
i#118572 - remove ui string and help content regarding
usage of Java Mail in Writer's Mail Merge as Java
Mail is not used.
http://svn.apache.org/viewvc?view=revision&revision=1197035

Patches contributed by Herbert Duerr
updated help text for regexp word boundaries
http://svn.apache.org/viewvc?view=revision&revision=1228026
improved help text for word boundary regexp expression \b
http://svn.apache.org/viewvc?view=revision&revision=1234738

Patches contributed by Jurgen Schmidt
remove onlineregistration with dependencies
http://svn.apache.org/viewvc?view=revision&revision=1240245

Patch contributed by Regina Henschel
Extended tips for corner and cap style
http://svn.apache.org/viewvc?view=revision&revision=1242287

* re-enable on-line update help, remove obsolete on-line purchasing.

2 files changed, 14 insertions, 0 deletions

diff --git a/to-wiki/getalltitles.py b/to-wiki/getalltitles.py
index 18a2dc0828..8db9bcb457 100755
--- a/to-wiki/getalltitles.py
+++ b/to-wiki/getalltitles.py
@@ -1,4 +1,11 @@
 #!/usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
 
 import sys
 import os
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 5b68912c0c..be968cbfba 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -1,4 +1,11 @@
 #!/usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
 
 import os, sys, thread, threading, time
 import xml.parsers.expat