Merge branch 'master' of github.com:/atgreen/libffi
authorAnthony Green <green@moxielogic.com>
Fri, 22 Nov 2013 02:25:44 +0000 (21:25 -0500)
committerAnthony Green <green@moxielogic.com>
Fri, 22 Nov 2013 02:25:44 +0000 (21:25 -0500)
Conflicts:
ChangeLog


Trivial merge