From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 31 May 2011 02:17:21 +0000 (-0400)
Subject: Merge commit 'upstream/0.1.4' into HEAD
X-Git-Tag: debian/0.1.4-1~6
X-Git-Url: http://andersk.mit.edu/gitweb/libyaml.git/commitdiff_plain/e01343456d08b6d2bfd53ced4fadb1529399bc96

Merge commit 'upstream/0.1.4' into HEAD
---

e01343456d08b6d2bfd53ced4fadb1529399bc96