jdarwood007/SMF2.1 — pull request #2 by Antes (2014-05-25 20:00:12+00:00)
Title: Ip headers

Well this looks right branch :P This'll fix the conflict stuff around..

:paw_prints: