Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:49 +0000 (12:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:49 +0000 (12:34 -0500)
commita7bea4d10e58645e2347b383b20968ecffcab896
tree3c3367e83e32f6143a0a565ac169cab1bfad6d58
parentde4afd0b4272028ccb02c4e158f754065ac9a5a7
parentbc3b34100c391979e77191c410cc4b5635c83630
Merge tag 'v1.2.0' into develop

Version 1.2.0