From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 10 Aug 2011 21:54:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/lttng-tools
X-Git-Tag: v2.0-pre11~11
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=7f275dfd12eb129d8c40c35b789a5853569decee

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

7f275dfd12eb129d8c40c35b789a5853569decee