Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 8 Mar 2016 16:55:02 +0000 (11:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 8 Mar 2016 16:55:02 +0000 (11:55 -0500)
commit176859ce8b2789167296d1a6d59661cb55889a28
treef463de86529738c781b9add244276a903562acf9
parent078e1957c354551dacbbbc391dfbc4925cd24a63
parent572f6d30f90a13baed5a12bf66d5ff6fd291d717
Merge branch 'hotfix/1.1.2'