Merge remote-tracking branch 'upstream/master'

3d697968 · Chris Bumgardner · e720e2c7 · 01a9c824 · 3d697968 · 3d697968
Commit 3d697968 authored Jan 20, 2013 by Chris Bumgardner
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 102 additions and 6 deletions

.gitignore .gitignore +1 -0

repositories.json repositories.json +101 -6

No files found.
--- a/.gitignore
+++ b/.gitignore
 .hg
+*.pyc
--- a/repositories.json
+++ b/repositories.json