Merge tag 'v2.0.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:59 +0000 (13:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 17:47:59 +0000 (13:47 -0400)
commitbea7b5bb2d767f79e36de35b5a59786774b18378
tree117c7c491aad6e2933c9c8f56c0fcffb528c19ef
parent1c336423896a2e20972c8656a1296c2904fc5ef6
parent47b864a7b6645c21f6c498c0945e2d041d205f7e
Merge tag 'v2.0.5' into develop

v2.0.5