From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 14 Jul 2011 13:36:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace
X-Git-Tag: v0.1~9
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=01c76b246be85b5d9c8e99813950fb194c9f714f;hp=01c76b246be85b5d9c8e99813950fb194c9f714f

Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

Conflicts:
	formats/ctf/ctf.c
---