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

This will update your PR and resolve the conflict.

:paw_prints: