Merge branch 'v4.4-branch' back into master

The manuals all will need a careful read.
The changes to use lsb-release and the PCLinuxOS specific files got lost
because I didn't want to try to rewite this in the middle of a merge.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	Documentation/50-pot/subsurface-manual.pot
	Documentation/fr/po/subsurface-manual.fr.po
	Documentation/user-manual.txt
	Documentation/user-manual_es.txt
	Documentation/user-manual_fr.html.git
	Documentation/user-manual_fr.txt
	Documentation/user-manual_ru.html.git
	Documentation/user-manual_ru.txt
	file.c
	qthelper.cpp
	subsurface.pro
	subsurfacesysinfo.cpp
	xslt/DiveLog.xslt

1 files changed, 4 insertions, 4 deletions

diff --git a/README b/README
index 71df24aef..26bb9b806 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the README file for Subsurface 4.4 Beta 3
+This is the README file for Subsurface 4.4.1
 
 Please check the ReleaseNotes.txt for details about new features and
-changes since Subsurface 4.3
+changes since Subsurface 4.4 (and earlier versions).
 
 Subsurface can be found at http://subsurface-divelog.org
 
@@ -24,11 +24,11 @@ If you want the latest release (instead of the bleeding edge
 development version) you can either get this via git or the release tar
 ball. After cloning run the following command:
 
-git checkout v4.3  (or whatever the last release is)
+git checkout v4.4.1  (or whatever the last release is)
 
 or download a tar ball from:
 
-http://subsurface-divelog.org/downloads/Subsurface-4.3.tgz
+http://subsurface-divelog.org/downloads/Subsurface-4.4.1.tgz
 
 Detailed build instructions can be found in the INSTALL file.