Merge branch 'master' into devel

Conflicts:
	Makefile.am
	configure.ac
	plugins/ffmpeg/ffmpeg.c
	plugins/gtkui/gtkui.c
	streamer.c

1 files changed, 1 insertions, 0 deletions

diff --git a/main.c b/main.c
index d555a291..0e86a29d 100644
--- a/main.c
+++ b/main.c
@@ -419,6 +419,7 @@ sigterm_handler (int sig) {
 
 int
 main (int argc, char *argv[]) {
+    fprintf (stderr, "starting deadbeef " VERSION "\n");
     srand (time (NULL));
 #ifdef __linux__
     prctl (PR_SET_NAME, "deadbeef-main", 0, 0, 0, 0);