Merge branch 't/girocco/restrictions' into refs/top-bases/girocco
commita4dee8a1ad916acc5656c58e6a2e6bf90e417dd4
authorKyle J. McKay <mackyle@gmail.com>
Tue, 28 Apr 2015 12:48:37 +0000 (28 05:48 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Tue, 28 Apr 2015 12:48:37 +0000 (28 05:48 -0700)
tree43af5abcea1c2249a228fc26a2debe7f92869e5f
parent97de7656d559a09d72095fc1c9c255e41c172810
parentf76678ab36750505ca283d71b8d714b5da72d548
Merge branch 't/girocco/restrictions' into refs/top-bases/girocco