14b9ff5df496: Merge
Nicholas Hastings <skamonkey@gmail.com> - Tue, 01 Mar 2011 21:22:09 -0500 - rev 3204
Merge

e4f91f0cb04d: Backed out changeset: 6da59ea19165
Nicholas Hastings <skamonkey@gmail.com> - Tue, 01 Mar 2011 21:22:01 -0500 - rev 3203
Backed out changeset: 6da59ea19165

4616d2ff20e2: Merge.
Nicholas Hastings <skamonkey@gmail.com> - Mon, 28 Feb 2011 19:47:14 -0500 - rev 3202
Merge.

33f77b0ed4d1: Updated Empires Mod gamedata for version 2.31a.
Nicholas Hastings <skamonkey@gmail.com> - Mon, 28 Feb 2011 19:45:44 -0500 - rev 3201
Updated Empires Mod gamedata for version 2.31a.

c044b2128731: Fixed graphical glitches with funcommands effects in L4D1 (bug 3486, r=fyren).
Nicholas Hastings <skamonkey@gmail.com> - Mon, 28 Feb 2011 19:45:36 -0500 - rev 3200
Fixed graphical glitches with funcommands effects in L4D1 (bug 3486, r=fyren).

0ecd385221c3: Added identifier for new TF2 flag event, 'returned' (bug 4808, r=fyren).
Nicholas Hastings <skamonkey@gmail.com> - Mon, 28 Feb 2011 19:44:41 -0500 - rev 3199
Added identifier for new TF2 flag event, 'returned' (bug 4808, r=fyren).

001863c7fcda: Updated TF2 condition idenifiers (bug 4801, r=fyren).
Nicholas Hastings <skamonkey@gmail.com> - Mon, 28 Feb 2011 19:43:08 -0500 - rev 3198
Updated TF2 condition idenifiers (bug 4801, r=fyren).
Added TFCond_InHealRadius (amputator glow) and fixed TFCond_Healing.

6da59ea19165: Fixed SetTeamScore not updating score on client (bug 2736, r=fyren).
Nicholas Hastings <skamonkey@gmail.com> - Mon, 28 Feb 2011 19:40:21 -0500 - rev 3197
Fixed SetTeamScore not updating score on client (bug 2736, r=fyren).

8cf2a7301140: Trigger build.
David Anderson <danderson@mozilla.com> - Sun, 27 Feb 2011 23:58:10 -0800 - rev 3196
Trigger build.

7148f94c4b20: Trigger build.
David Anderson <danderson@mozilla.com> - Sun, 27 Feb 2011 23:33:15 -0800 - rev 3195
Trigger build.