SimpleMachines/SMF2.1 — pull request #261 by mikemill (2012-12-16 19:19:49+00:00)
Title: Lab r21

Merge conflict resolved for #258