From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 26 Aug 2011 17:52:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-tools
X-Git-Tag: v2.0-pre13~19^2
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=f8f0c3d1337c4eda5fb76a323ffe6c21c926a21e

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

f8f0c3d1337c4eda5fb76a323ffe6c21c926a21e