Merge branch 'master' into strings
authorDavid Vázquez <davazp@gmail.com>
Fri, 3 May 2013 01:05:02 +0000 (02:05 +0100)
committerDavid Vázquez <davazp@gmail.com>
Fri, 3 May 2013 01:05:02 +0000 (02:05 +0100)

Trivial merge