Merge branch 'hotfix/1.2.13' v1.2.13
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:27:35 +0000 (13:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:27:35 +0000 (13:27 -0500)
commit16e9eb8d2a5fc438bbb23e030553a8434e6f980c
tree28782ba27517f2eda2902d7c110f58f7f729e297
parenta21ff59eed809e2607199c6c0d8d0715838e0e99
parentf443c25a509455b834a3610a42721ba306d7e11e
Merge branch 'hotfix/1.2.13'