Merge branch 'master' into new-compiler
authorDavid Vázquez <davazp@gmail.com>
Sun, 12 May 2013 10:06:04 +0000 (11:06 +0100)
committerDavid Vázquez <davazp@gmail.com>
Sun, 12 May 2013 10:06:04 +0000 (11:06 +0100)

Trivial merge