Fix language typo in Migrations library

lang and line were out of order
Merge pull request #1936 from etcgroup/2.1-stable

Bug in 2.1-stable - language typo in Migrations library
Error on line 1407 of db_active_rec.php traces to mis-named variables

Corrected variables to $k2 and $v2
Convert liefeeds to Unix style
Merge pull request #2021 from tomcode/linefeedsMigration

Linefeeds migration #2
Merge pull request #1969 from CoeusCC/patch-2

Error on line 1407 of db_active_rec.php traces to mis-named variables
Email library: htmlspecialchars for _header_str
Merge pull request #2337 from moi90/2.1-stable

Email library: htmlspecialchars for _header_str
Merge pull request #8 from EllisLab/2.1-stable

merge upstream