tree d25b9e3264ac10d7b76e621181388412549b61c8
parent d31e4b430fd0311ee29ce10307d6d5bdf3caf9b8
parent 34f90e69aee6f1b8f6b85f903c525d1a9389451d
author Mike Bayer <mike_mp@zzzcomputing.com> 1457562826 -0500
committer Mike Bayer <mike_mp@zzzcomputing.com> 1457562826 -0500

Merge remote-tracking branch 'github/pr/19'