Merge branch 'hotfix/1.1.15' v1.1.15
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:24:29 +0000 (14:24 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:24:29 +0000 (14:24 -0400)
commitd2113c8bf944735962f44b438b99d5c3a7699dad
treea396b8bc3545d4aef6a87524aa02750e288d4276
parentb128958a4e0075e685a1f42e65e6925fc5ee34c0
parent56bb4754c28bca0bb5c780025092de802c392ade
Merge branch 'hotfix/1.1.15'