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

This commit is contained in:
jekyllbot
2016-01-07 22:26:41 -08:00
parent ade8a0107f
commit a12ee55139

File diff suppressed because one or more lines are too long