Merge branch 'strings'
authorDavid Vázquez <davazp@gmail.com>
Sat, 15 Jun 2013 09:08:37 +0000 (11:08 +0200)
committerDavid Vázquez <davazp@gmail.com>
Sat, 15 Jun 2013 09:08:37 +0000 (11:08 +0200)

Trivial merge