Merge branch 'strings'
authorJean Privat <jean@pryen.org>
Thu, 27 Mar 2014 06:25:49 +0000 (02:25 -0400)
committerJean Privat <jean@pryen.org>
Thu, 27 Mar 2014 06:25:49 +0000 (02:25 -0400)

Trivial merge