From: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Date: Tue, 22 Oct 2013 16:52:30 +0000 (-0400)
Subject: Merge branch 'master' into lttng-luna
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=89fb894e4f338746ed1d13135921a988062ec483;p=deliverable%2Ftracecompass.git

Merge branch 'master' into lttng-luna
---

89fb894e4f338746ed1d13135921a988062ec483