From: David Goulet <dgoulet@efficios.com>
Date: Sun, 14 Jul 2013 19:29:41 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.3.0-rc1~29
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=faeeaa0c38c2877c2dd614804a3a813900b1288e;p=lttng-tools.git

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

faeeaa0c38c2877c2dd614804a3a813900b1288e