Merge branch 'master' of github.com:/atgreen/libffi
authorAnthony Green <green@moxielogic.com>
Fri, 28 Feb 2014 05:26:57 +0000 (00:26 -0500)
committerAnthony Green <green@moxielogic.com>
Fri, 28 Feb 2014 05:27:23 +0000 (00:27 -0500)
Conflicts:
ChangeLog


Trivial merge