Merge branch 'hotfix/1.2.35' v1.2.35
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:06:03 +0000 (15:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 20:06:03 +0000 (15:06 -0500)
commitda8c974279fe2a4dc50942d03dffb9a9d7e86336
tree12fba2031e4fea22e06c3fd16fdf020bced13e3c
parentf48c5b10a075f69db7fc2b58e0ba7d9f46083082
parentd2bda730f28ac23678d35188d660059eb8dba6c6
Merge branch 'hotfix/1.2.35'