Commit ff647ad4dff2f07dd153f295a1f70b1d906cd6ca

Anthony Green 2013-03-16T08:20:40

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