From: David Goulet <dgoulet@efficios.com>
Date: Tue, 21 Feb 2012 22:53:02 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0.0-rc2~35
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=373d38732a83167f19c3be89cf9ff238743cdeb0;hp=-c

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

373d38732a83167f19c3be89cf9ff238743cdeb0