Merge branch 'hotfix/1.2.34' v1.2.34
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jan 2015 16:51:18 +0000 (11:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Jan 2015 16:51:18 +0000 (11:51 -0500)
commitf48c5b10a075f69db7fc2b58e0ba7d9f46083082
treedd56447ed0eccbd086d9c5d44ca2b5f5e8a006ed
parent810a81607326914cc720faf56f77a92a87d71ea4
parentb27d339ae2d788afe77454c56284f395c653172a
Merge branch 'hotfix/1.2.34'