Merge branch 'master' into stable

Conflicts: logos.js
2012-04-16 01:08:27 -06:00 · 2012-04-16 01:08:27 -06:00 · adb82e2e5d
parent 6872d1fc6c a0a8d5da5e
commit adb82e2e5d
2 changed files with 1 additions and 0 deletions
--- a/logos.js
+++ b/logos.js
@ -16,6 +16,7 @@ teams = [
    ["DD",      "doomsdames.png", "Albuquerque Doomsdames"],
    ["TEX",     "texpistols.png", "El Paso Tex Pistols"],
    ["PWH",     "pistol.png",     "El Paso Pistol Whip-Hers"],
+    ["MT",      "minorthreat.png", "Minor Threat"],
 ];
 teams.sort();

--- a/logos/minorthreat.png
+++ b/logos/minorthreat.png