From: Julien Desfossez <jdesfossez@efficios.com>
Date: Mon, 12 Sep 2016 19:39:51 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=e59a66adba227b4af4c9347c96caedfcad4ce4af;p=deliverable%2Flttng-tools.git

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

e59a66adba227b4af4c9347c96caedfcad4ce4af