Merge branch 'master' into collab/miker/sprint4 sprint4-merge-nov22
authorGalen Charlton <gmc@esilibrary.com>
Tue, 22 Nov 2016 21:11:55 +0000 (16:11 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Tue, 22 Nov 2016 21:11:55 +0000 (16:11 -0500)
commit9cd9d505f1bd89cba9cabd9d89d2d94cbc392e6f
tree2bf392ffb0f1eece2fb6111984f53dce4f63e0d5
parent12ee41d085e699c5d31bce9e002a3c5c0276b378
parent46c2449ef4b498486852b46d1ef604b3dfcea0fe
Merge branch 'master' into collab/miker/sprint4