Merge remote-tracking branch 'upstream/develop' into tally-align

This commit is contained in:
Sam Shaner 2015-12-23 21:44:00 -08:00
commit 990e7eba3a

View file

@ -82,6 +82,7 @@ This release contains new contributions from the following people:
- `Will Boyd <wbinventor@gmail.com>`_
- `Sterling Harper <sterlingmharper@mit.edu>`_
- `Bryan Herman <hermab53@gmail.com>`_
- `Colin Josey <cjosey@mit.edu>`_
- `Adam Nelson <nelsonag@umich.edu>`_
- `Paul Romano <paul.k.romano@gmail.com>`_