From: David Goulet <david.goulet@polymtl.ca>
Date: Tue, 29 Nov 2011 23:18:13 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~60
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e0b03593613331103ad4c15a95f5495a31289225;p=lttng-tools.git

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

e0b03593613331103ad4c15a95f5495a31289225