From: Bdale Garbee <bdale@gag.com>
Date: Sun, 27 Nov 2011 05:50:35 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=6c606ee032a5b27e7baadfc46734f23bddbaeb6c;p=web%2Faltusmetrum

Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum

Conflicts:
	AltOS/launch-sites.txt
---

6c606ee032a5b27e7baadfc46734f23bddbaeb6c
diff --cc AltOS/launch-sites.txt
index fdc2cea,77b78e8..2bc1e38
--- a/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@@ -6,7 -6,7 +6,7 @@@ COSROCS Challenger:38.99624:-104.773979
  COSROCS Peyton:39.072695:-104.430031:http://cosrocs.org/
  HARA Bragg Farms:34.895875:-86.616211;http://www.hararocketry.org/HARA/Main.html
  KLOUDBusters Rocket Pasture:37.167833333:-97.73975:http://kloudbusters.org/
- MDRA Higgs Farm:39.07854:-75.87634:http://www.mdrocketry.org/
 -MDRA Higgs Farm:39.078541666666667:-75.876345833333333:http://www.mdrocketry.org/
++MDRA Higgs Farm:39.07854167:-75.87634583:http://www.mdrocketry.org/
  METRA Pine Island:41.31939:-74.47077:http://metrarocketclub.org/
  NCR Atlas Site:40.65:-104.38333:http://ncrocketry.org/
  NCR Pawnee North Site:40.885955:-104.63793:http://ncrocketry.org/