Merge branch 'master' into notifications

Conflicts:
	daemon/daemon.cpp
	daemon/manager.cpp
	daemon/manager.h

1 files changed, 2 insertions, 2 deletions

diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index 1ab7b8c..e075c0c 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -70,8 +70,6 @@ void initLogging()
     Log4Qt::LogManager::setHandleQtMessages(true);
 
     qDebug() << "Using following log config file: " << usedConfigFile;
-
-    Log4Qt::Logger::logger(QLatin1String("Main Logger"))->info("Logging started");
 }
 
 int main(int argc, char *argv[])
@@ -82,6 +80,8 @@ int main(int argc, char *argv[])
     // QCoreApplication for determining the .conf files locations
     initLogging();
 
+    Log4Qt::Logger::logger(QLatin1String("Main Logger"))->info() << argv[0] << APP_VERSION;
+
     watch::WatchConnector watch;
     DBusConnector dbus;
     VoiceCallManager voice;