Merge branch 'hashtables'
authorDavid Vázquez <davazp@gmail.com>
Sun, 16 Feb 2014 19:38:45 +0000 (20:38 +0100)
committerDavid Vázquez <davazp@gmail.com>
Sun, 16 Feb 2014 19:38:45 +0000 (20:38 +0100)

Trivial merge