From: Julien Desfossez <jdesfossez@efficios.com>
Date: Tue, 17 May 2016 17:22:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=69000865eccf5ab147c3cfe92ed21b5ec8c4a1bf

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

69000865eccf5ab147c3cfe92ed21b5ec8c4a1bf