From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 5 Aug 2011 19:49:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-modules
X-Git-Tag: v2.0-pre7~5
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b265a505ba25418104f3425e4475f45419844e8a;p=lttng-modules.git

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

b265a505ba25418104f3425e4475f45419844e8a