From: Julien Desfossez <jdesfossez@efficios.com>
Date: Thu, 12 May 2016 05:05:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=a949c9a397c0730c9414bf1ebfd024691bded6e8;p=lttng-tools.git

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

a949c9a397c0730c9414bf1ebfd024691bded6e8