Merge branch 'triple_quoted_strings'
authorJean Privat <jean@pryen.org>
Thu, 25 Jul 2013 15:43:15 +0000 (11:43 -0400)
committerJean Privat <jean@pryen.org>
Thu, 25 Jul 2013 15:43:15 +0000 (11:43 -0400)

Trivial merge