Merge branch 'codegen-integration' into codegen
authorDavid Vázquez <davazp@gmail.com>
Fri, 21 Jun 2013 23:20:33 +0000 (01:20 +0200)
committerDavid Vázquez <davazp@gmail.com>
Fri, 21 Jun 2013 23:20:33 +0000 (01:20 +0200)

Trivial merge