Merge branch 'release/1.0.48' v1.0.48
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:34:06 +0000 (14:34 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 14 Dec 2015 19:34:06 +0000 (14:34 -0500)
commit4fb3eb59dc1390745ba7385274852af4b155fb0f
treefdbe75bf6dc5bc0226b8bba129515f5abf0d560c
parent9667f5b34d8ff463d2f658aa3cc244f10bd250b9
parent4134ab8c8e3c0601f729797ceba63746d5c87521
Merge branch 'release/1.0.48'