Revert "Update history to reflect merge of #4330 [ci skip]"

This reverts commit a12ee55139.
This commit is contained in:
Parker Moore
2016-01-07 22:27:47 -08:00
parent a12ee55139
commit 97a6a312ac

File diff suppressed because one or more lines are too long