Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --cc Makefile.am
index bab695466d212894d07d9416e20bfda017e67342,b16632a4a33732e4bee372227c7eca7c80f08311..a02a1d1d35ce0b62c3a809551daa7b532c222885
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -7,7 -5,7 +7,10 @@@ SUBDIRS = src/common/ 
                  include \
                  doc
  
- 
- dist_doc_DATA = ChangeLog
+ dist_doc_DATA = LICENSE \
+                 ChangeLog
+ 
+ EXTRA_DIST = extras/lttng-bash_completion
++
 +bench:
 +      ./benchmark/runall.sh

diff --cc configure.ac
Simple merge

diff --cc src/bin/lttng-sessiond/main.c
Simple merge