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

This commit is contained in:
jekyllbot
2016-01-07 23:22:07 -08:00
parent 97a6a312ac
commit bfc07a39c6

File diff suppressed because it is too large Load Diff