Commit 926b6989fbd08488b9105943293353d45ac527e0

Anthony Green 2014-02-28T00:26:57

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