Merge branch 'hotfix/0.15.1' v0.15.1
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:55:53 +0000 (14:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:55:53 +0000 (14:55 -0400)
commitd9b72815c09f866aaff3366aeec59c3970ff05f6
tree20928615ee5bdd628fe79dba656acf5e66a1396e
parent82e550c847a4afb9f1a5157a566b1db79846e04f
parentc568f273b4e4d88ba00eee0beac3076636541c1d
Merge branch 'hotfix/0.15.1'