Merge tag 'v1.2.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:28:02 +0000 (12:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:28:02 +0000 (12:28 -0400)
commit627f56132a0fffe3e8bfec64cd314b15a01bac7c
treeda37a8ec70f1e81580074e2c5256d6e44ceb5169
parent2dcdc8eafde93eb08db0c68167ea3009ba9012e2
parent9d7f985a55796b03d67dd536cc78fcde67b3a8e6
Merge tag 'v1.2.5' into develop

v1.2.5