From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 6 Mar 2012 23:07:24 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: v2.1.0-rc1~97^2~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e3feda7db3de3530e7c9c511536c36cccf317013;p=lttng-ust.git

Merge branch 'master' into dev
---

e3feda7db3de3530e7c9c511536c36cccf317013