From: Bdale Garbee <bdale@gag.com>
Date: Wed, 10 Aug 2011 22:35:56 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=25d93927a971cab7820af9f26664aec89004140a;p=web%2Faltusmetrum

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

25d93927a971cab7820af9f26664aec89004140a
diff --cc AltOS/launch-sites.txt
index be68f84,c93bd21..fd86ede
--- a/AltOS/launch-sites.txt
+++ b/AltOS/launch-sites.txt
@@@ -10,7 -10,8 +10,8 @@@ NCR Pawnee North Site:40.885955:-104.63
  OPROC Discovery Bay:47.97808,-122.896383
  OROC Brothers:43.79949786336483:-120.6485810681392
  OROC Sheridan:45.044176:-123.314323
+ OROC Wilsonville:45.297186:-122.759067
  QRS Cedar Grove:-27.8512283:152.9624000
 -SCORE Hudson Ranch:38.155602777777778:-104.809119444444444
 -Tripoli Colorado Hartsel:39.009247:-105.702338
 +SCORE Hudson Ranch:38.155602777777778:-104.809119444444444:http://scronline.net/
 +Tripoli Colorado Hartsel:39.009247:-105.702338:http://tripolicolorado.org/
  WAC Sportsman Club:47.815327777777778:-119.427186111111111