Fix merge conflicts from 1.5.1 release notes

This commit is contained in:
James Tanner 2014-03-10 18:55:17 -04:00
commit 5a24d19a06

Diff content is not available