Merge pull request #378 from mhaskel/1.7.0-prep 1.7.x 1.7.0
authorColleen Murphy <cmurphy@users.noreply.github.com>
Tue, 28 Oct 2014 16:26:56 +0000 (09:26 -0700)
committerColleen Murphy <cmurphy@users.noreply.github.com>
Tue, 28 Oct 2014 16:26:56 +0000 (09:26 -0700)
commit5179b0e466b82ec9dd912fcac9bd06ffe61aee11
treed3e6de540926a17ce968bb4c1d3a72e4de5a7c7d
parent7c71390cd15facf38ef7cc5718205d6811b936b6
parentdfdcfa025554f06c64de1c06b36b8bd96487a22c
Merge pull request #378 from mhaskel/1.7.0-prep

1.7.0 prep