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)
commit2990cdd630ac7ce8cd1dfc738959f0b12d92564d
tree915504c23835c7bed6f12862f8b68d9b2f239d56
parentd15ff6cf9e47d39ec9949ebafa1dcd2be6ac8be7
parent07746188cb92ad30b3c86c2598aa0f64ea9ef2ea
Merge branch 'master' into strings