Merge branch 'master' of https://github.com/bivab/libffi

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 806af18,a589fd9..a789f85
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,8 +1,19 @@@
 -      * src/arm/ffi.c: Fix register allocation for mixed float and doubles.
 -      * testsuite/libffi.call/cls_many_mixed_float_double.c: Testcase for many
 -      mixed float and double arguments.
+ 2013-11-14  David Schneider  <david.schneider@bivab.de>
+ 
++      * src/arm/ffi.c: Fix register allocation for mixed float and
++      doubles.
++      * testsuite/libffi.call/cls_many_mixed_float_double.c: Testcase
++      for many mixed float and double arguments.
++
 +2013-11-13  Alan Modra  <amodra@gmail.com>
 +
 +      * doc/libffi.texi (Simple Example): Correct example code.
 +      * doc/libffi.info, doc/stamp-vti, doc/version.texi: Rebuilt.
 +
 +2013-11-13  Anthony Green  <green@moxielogic.com>
 +
 +      * include/ffi_common.h: Respect HAVE_ALLOCA_H for GNU compiler
 +      based build. (Thanks to tmr111116 on github)
  
  2013-11-09  Anthony Green  <green@moxielogic.com>