From: Anthony Green <green@moxielogic.com>
Date: Fri, 28 Feb 2014 05:26:57 +0000 (-0500)
Subject: Merge branch 'master' of github.com:/atgreen/libffi
X-Git-Tag: v3.1~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=926b6989fbd08488b9105943293353d45ac527e0;p=platform%2Fupstream%2Flibffi.git

Merge branch 'master' of github.com:/atgreen/libffi

Conflicts:
	ChangeLog
---

926b6989fbd08488b9105943293353d45ac527e0