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)
commit852ac3bd302d6ed97b1ef65f4cbed69c258a48df
tree3ed261655ba53cd2269dba583d6f3bf561adb34d
parentab79d6e21992dd86139ba07530ff888833b78a04
parentac7536889334d4be50709006d7e23536364d7891
Merge branch 'master' of github.com:/atgreen/libffi

Conflicts:
ChangeLog