From: Julien Desfossez <jdesfossez@efficios.com>
Date: Fri, 18 Mar 2016 22:36:00 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=76aa4da9bdeb06ed335da8142cb64bde6d0b46d2;p=lttng-tools.git

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

76aa4da9bdeb06ed335da8142cb64bde6d0b46d2