Merge remote-tracking branch 'alexis/prepare-for-ffi'
authorJean Privat <jean@pryen.org>
Mon, 5 Aug 2013 18:11:15 +0000 (14:11 -0400)
committerJean Privat <jean@pryen.org>
Mon, 5 Aug 2013 18:11:15 +0000 (14:11 -0400)
commit5806976c09452d7a0f3e4be28c314c776fb390a5
treef901c121bd82818eb66cb4970921509b6f28c128
parent088b02fad33bd0a724470b9a0db4ac1598938219
parent84c0e5ffd55166960512bb7cd1f4e3aca98d30f1
Merge remote-tracking branch 'alexis/prepare-for-ffi'