From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 10 Nov 2011 20:10:42 +0000 (-0500)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre15~136
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=dbdbd482ead909120dc3c4e4b6e41413b7fa57a1

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

dbdbd482ead909120dc3c4e4b6e41413b7fa57a1