From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 13 Apr 2011 17:28:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.lttng.org/home/git/ust
X-Git-Tag: v0.13~34
X-Git-Url: https://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=b64d025089c6d40963e029cff23efed4ed1f2f22

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

b64d025089c6d40963e029cff23efed4ed1f2f22