Merge branch 't/girocco/style-updates' into refs/top-bases/girocco
commitb4b4ba6e435a59e8868930bbd5dc8603f1403d6f
authorKyle J. McKay <mackyle@gmail.com>
Tue, 28 Apr 2015 12:51:30 +0000 (28 05:51 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Tue, 28 Apr 2015 12:51:30 +0000 (28 05:51 -0700)
tree43af5abcea1c2249a228fc26a2debe7f92869e5f
parenta4dee8a1ad916acc5656c58e6a2e6bf90e417dd4
parent4feb0e855b8a0e281d16e775bd6ec0c428cbfce8
Merge branch 't/girocco/style-updates' into refs/top-bases/girocco