SimpleMachines/SMF2.1 — pull request #1258 by MissAllSunday (2014-01-23 03:45:45+00:00)
Title: Jdarwood007 ip headers option

This is just an attempt to solve the merge conflicts in #722