Merge branch 'release/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:38 +0000 (15:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:38 +0000 (15:44 -0400)
commiteed97e77d170554f1abfd960b91442786a060f85
tree7381d00aa3d4a1e2747d9e2d7e6b490a35e32127
parente0563940117cf1ad0c6604c7a5e560080dac8d97
parent84d9a2404e02d215b2275124433c5f5379d525af
Merge branch 'release/1.2.2'