Merge branch 'master' into ffi
authorDavid Vázquez <davazp@gmail.com>
Fri, 7 Jun 2013 15:24:56 +0000 (16:24 +0100)
committerDavid Vázquez <davazp@gmail.com>
Fri, 7 Jun 2013 15:24:56 +0000 (16:24 +0100)

Trivial merge