From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 12 Nov 2013 16:23:52 +0000 (-0500)
Subject: Merge branch 'master' into bindings/python
X-Git-Tag: v1.2.0-rc1~69
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=550461940505dbeae425d1b87d145549800a5341

Merge branch 'master' into bindings/python
---

550461940505dbeae425d1b87d145549800a5341