tree 2d814bfffc9d31538c464732098c089febdbf0e3
parent c972b2ce23632f3b8b0fbff4125bbee92d394d7f
parent ea16c7be43a7a1b1b19f91b6d2585dc12a90bbda
author Steve Loughran <stevel@hortonworks.com> 1400684356 +0100
committer Steve Loughran <stevel@hortonworks.com> 1400684356 +0100

Merge branch 'feature/SLIDER-35' into develop