From: David Goulet <dgoulet@efficios.com>
Date: Fri, 2 Mar 2012 20:19:52 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0.0-rc3~17
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=52b07d8a5f38946bea3176d486c1934ca7639415;p=lttng-tools.git

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

52b07d8a5f38946bea3176d486c1934ca7639415