Merge branch 'master' of git@gitorious.org:rit_olpc/rit_olpc
[rit_olpc:jlews-rit_olpc.git] / MyNameIs
1 1. Wesley W. Dillingham
2 2. Frederick Grose, Sugar Labs, OLPC volunteer
3 3. Preston Johnson
4 4. Justin Lewis
5 5. Alex Jones
6 <<<<<<< HEAD:MyNameIs
7 6. Eric Kenvin
8 =======
9 >>>>>>> a51aec9ad7fc9daa4f79fbf428ff8d23ef06c1a1:MyNameIs