[pypy-commit] cffi default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r1221:e43094a16966
Date: 2013-04-02 19:21 +0200
http://bitbucket.org/cffi/cffi/changeset/e43094a16966/

Log:	merge heads

diff --git a/AUTHORS b/AUTHORS
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
 This package has been mostly done by Armin Rigo with help from
-Maciej Fijałkowski.
\ No newline at end of file
+Maciej Fijałkowski. The idea is heavily based (although not directly
+copied) from LuaJIT ffi by Mike Pall.