Merge branch 'maint/2.2.x' into master

effigies · effigies · commit 2817d1bde8da · 2017-11-22T21:56:09.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -40,3 +40,4 @@ Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
 Jasper J.F. van den Bosch <japsai@gmail.com> Jasper <japsai@gmail.com>
 Gregory R. Lee <grlee77@gmail.com> Gregory R. Lee <gregory.lee@cchmc.org>
 Demian Wassermann <demian@bwh.harvard.edu> Demian Wassermann <demian.wassermann@inria.fr>
+Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
diff --git a/Changelog b/Changelog
@@ -24,6 +24,25 @@ Gerhard (SG) and Eric Larson (EL).
 
 References like "pr/298" refer to github pull request numbers.
 
+2.2.1 (Wednesday 22 November 2017)
+==================================
+
+Bug fixes
+---------
+
+* Set L/R labels in orthoview correctly (pr/564) (CM)
+* Defer use of ufunc / memmap test - allows "freezing" (pr/572) (MB, reviewed
+  by Satra Ghosh)
+* Fix doctest failures with pre-release numpy (pr/582) (MB, reviewed by CM)
+
+Maintenance
+-----------
+
+* Update documentation around NIfTI qform/sform codes (pr/576) (Paul McCarthy,
+  reviewed by MB, CM) + (pr/580) (Bennet Fauber, reviewed by Paul McCarthy)
+* Skip precision test on macOS, newer numpy (pr/583) (MB, reviewed by CM)
+* Simplify AppVeyor script, removing conda (pr/584) (MB, reviewed by CM)
+
 2.2 (Friday 13 October 2017)
 ============================
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -79,6 +79,7 @@ contributed code and discussion (in rough order of appearance):
 * Venky Reddy
 * Mark Hymers
 * Jasper J.F. van den Bosch
+* Bennet Fauber
 
 License reprise
 ===============

-Original file line number
+Diff line change
 Jasper J.F. van den Bosch <[email protected]> Jasper <[email protected]>
 Gregory R. Lee <[email protected]> Gregory R. Lee <[email protected]>
 Demian Wassermann <[email protected]> Demian Wassermann <[email protected]>
 +Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>