Merge tag 'v1.2.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:46 +0000 (15:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:46 +0000 (15:44 -0400)
commit2a143f5cafd824c89061f6d0c04733556f18a752
tree7381d00aa3d4a1e2747d9e2d7e6b490a35e32127
parent84d9a2404e02d215b2275124433c5f5379d525af
parenteed97e77d170554f1abfd960b91442786a060f85
Merge tag 'v1.2.2' into develop

Version 1.2.2