Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:47:57 +0000 (15:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jul 2015 19:47:57 +0000 (15:47 -0400)
commit5c93519046fc491bb8942beb33e0efa446f86016
tree2f58404c09c39550704bea9bb190f7db0cf0f8f5
parentf8b794051196c4d6764e3cc90c8312db6a79ec4d
parent9281029dd02b2167781fc9dc05c1c05eee1590ff
Merge branch 'hotfix/1.0.5'