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)
commit3757bebf33e5b28abc6618a4d7291746f7dc0ecd
tree1d74999f04401bcbe105426678ce85a19d8237cd
parent4177945bc266d5f74c3e1663356f927c3a938ece
parentca2b939ded2816e6b83b8cb546323c5d45d882c2
Merge branch 'strings'