Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 8 May 2014 04:38:45 +0000 (21:38 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 8 May 2014 04:38:45 +0000 (21:38 -0700)
commitc8388749680693b4d0f261dc6151e14ee450f90c
tree69b66aa670fb503433c789df2b5b864fb1a84e16
parentf0a851f091786c3801ffa8c5a30fc3bcfca88f7c
parent898345db5240fcfca1567725fa9779b1fecbe1c7
Merge branch 'master' into Gtk.
tests/ffi/test-ffi.scm