Merge branch '2510-new-foolscap'
authorBrian Warner <warner@lothar.com>
Wed, 23 Sep 2015 04:30:03 +0000 (21:30 -0700)
committerBrian Warner <warner@lothar.com>
Wed, 23 Sep 2015 04:30:03 +0000 (21:30 -0700)

Trivial merge