Merge branch 'master' into wstr
authorReid Kleckner <rnk@google.com>
Mon, 19 Aug 2013 23:44:30 +0000 (16:44 -0700)
committerReid Kleckner <rnk@google.com>
Mon, 19 Aug 2013 23:44:30 +0000 (16:44 -0700)

Trivial merge