Merge branch 'hotfix/1.1.18' v1.1.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:39:20 +0000 (09:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:39:20 +0000 (09:39 -0400)
commit3e7bd51297d13a278d7bf64e36a316ab5e2ccf1d
treef377074040a0a3f49c1e17b7dc153d069b11b967
parent234577db3703f8e4b10fe8c4d481049a8b54e1a9
parent5bb797f2be24e52d039377de0dfe9e7320881988
Merge branch 'hotfix/1.1.18'