Merge branch 'release/1.0.12' v1.0.12
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:56:57 +0000 (11:56 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 15:56:57 +0000 (11:56 -0400)
commit0b04864b4fa5f4872c8739bde31900534bc2af74
tree4daaa09220e2b58c23f6f657d34f664646f16bba
parent08d88d15438b75398a44e7f91168905ac040e3d7
parent9a47e4fbdaafc05e33002bd9191c3859dc16bc89
Merge branch 'release/1.0.12'