merging...
merging chapel-lang
Adding my line to Thomas's Git Intro test.

(cherry picked from commit 0898a913fe8d5901199ee4689e12e0fb2ee54742)
Add Thomas adlibs to GitIntro test.

Used in presentation as demo/exercise.

(cherry picked from commit 15335473df08355f0fe4d149c4bb0a55d1906510)
Ad Thomas to GitIntro.chpl

(cherry picked from commit 62656974f53707b5e8388ecc05f4b061ea47fecc)
Now Thomas is ecstatic.

(cherry picked from commit 3035ac7563e01d65c221df763be326f618f7a0dd)
Merge pull request #6 from thomasvandoren/fix-master-after-sync-trampling

Fix master after sync trampling
merging
fixing for merge
Merge pull request #5 from tzakian/add-tim

Add tim
Adding my line to GitIntro
[Reviewed by @mppf]
Refactoring the HDFS plugin to conform with Michael's QIO commit. This also adds
refcounting to the HDFS handle, and fixes a bug where we could try to close the same
file more than once (fixed by turning off QIO_HINT_OWNED after closing the file).
updating with chapel-lang
Merge pull request #7 from tzakian/hdfs-refactor

[Reviewed by @mppf]
Add Lydia adlibs to GitIntro test.
Adding parallel glob iterator. This should be portable (tested both on linux and
mac).
Merge pull request #9 from lydia-duncan/add-lydia-to-git-exercise

Add Lydia adlibs to GitIntro test.

Well that was easy enough.
Merge pull request #8 from benharsh/git-intro

Adding my line to GitIntro
git rid of two functions
Merge branch 'master' into parallel-glob