rcos/Observatory — pull request #26 by c00w (2013-02-21 01:58:37+00:00)
Title: Merge Master in rcos-production

So, I'm wondering why there are commits on master, other than mine which aren't on rcos-production. I'm going to pick tim horton.