Merge branch 'master' into experimental-compiler
authorDavid Vázquez <davazp@gmail.com>
Mon, 27 May 2013 20:49:51 +0000 (21:49 +0100)
committerDavid Vázquez <davazp@gmail.com>
Mon, 27 May 2013 20:49:51 +0000 (21:49 +0100)

Trivial merge