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)
commit7304183dbf4d164f4c434e52ce795dc25adf972a
treee8d6fd6ba15d11c291ef11ff615103db43634d44
parentab2386d19d534a8f9d6d0762e36ee5c3dc72b9b4
parent6975df47e3bb92aa6af661ef4c0e7bb7a10915f1
Merge branch 'master' into ffi