Merge tag 'v1.0.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:19:54 +0000 (12:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 16:19:54 +0000 (12:19 -0400)
commit66afeabc3a2b6f8687c9a9a570f7032a3cbc9b04
tree318ef2ca9f883b0425b4aa9b209d1facbde711a5
parent90f3bf74161e726dd9b2a6060bde228044a4b526
parent048b75132158424aec0f1193a037599da0d05003
Merge tag 'v1.0.6' into develop

v1.0.6