SimpleMachines/SMF2.1 — pull request #108 by emanuele45 (2012-07-30 14:06:24+00:00)
Title: Ant master

Hopefully that should do a clean merge...