Merge branch 't/girocco/style-updates' into refs/top-bases/girocco
commitd3404c07ade7f5411ec6618e4f29e5286358e561
authorKyle J. McKay <mackyle@gmail.com>
Mon, 14 Sep 2015 16:24:09 +0000 (14 09:24 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Mon, 14 Sep 2015 16:24:09 +0000 (14 09:24 -0700)
treeb3a867d5217712a38966428c56a1c6635b62dfb6
parent8df74b883bd3a864306824585653197c8b39dec2
parent45ad5dd990862f8189ef093173330c9668b87553
Merge branch 't/girocco/style-updates' into refs/top-bases/girocco