Merge branch 'master' of https://github.com/bivab/libffi
authorAnthony Green <green@moxielogic.com>
Thu, 14 Nov 2013 15:56:29 +0000 (10:56 -0500)
committerAnthony Green <green@moxielogic.com>
Thu, 14 Nov 2013 15:56:29 +0000 (10:56 -0500)
commitde10f5039ed7a53382ddcc95c368d03e535edb98
tree422fa612202c01ad07390143f8cb23d674a83d42
parent58c2577a3ff80e7416ef0434769e2af23365719c
parentf3657da278dd63afcdd8762894a9bdaea8ef028a
Merge branch 'master' of https://github.com/bivab/libffi

Conflicts:
ChangeLog
ChangeLog