Commit 852ac3bd302d6ed97b1ef65f4cbed69c258a48df

Anthony Green 2013-11-21T21:25:44

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