From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 15 Sep 2011 18:26:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
X-Git-Tag: v2.0-pre9~69
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=69e6fcd16e0dd921a897e26b6655131f2afe98ea;p=lttng-modules.git

Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
---

69e6fcd16e0dd921a897e26b6655131f2afe98ea