Merge branch 'hotfix/1.1.13' v1.1.13
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:34:07 +0000 (11:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:34:07 +0000 (11:34 -0400)
commit1c74e7d658965c21610936474765c77151eeaed4
tree2ef3051b848d6e06977ebbd16f4540f6f4ab501c
parentcdc21cbfc5b84e5efd541843e17e9607111e900b
parent9aaa14414eeb29c6d77cce284736fc2b2fc1740e
Merge branch 'hotfix/1.1.13'